summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraaronwl <aaronwl@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-20 08:05:09 +0000
committeraaronwl <aaronwl@138bc75d-0d04-0410-961f-82ee72b054a4>2004-10-20 08:05:09 +0000
commit38750fcd25f127210474de9b33528a6eb6fa3c4e (patch)
tree13456dacd096c675b22df7653f159a2339b12974
parente6e477bbc565d4110104cef854fdcdd0531d7024 (diff)
downloadgcc-38750fcd25f127210474de9b33528a6eb6fa3c4e.tar.gz
* adaint.c (__gnat_get_libraries_from_registry): Cast value
to LPBYTE. (__gnat_portable_spawn): Remove const. * mingw32.h (MAXPATHLEN): Check for previous definition. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89323 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ada/ChangeLog8
-rw-r--r--gcc/ada/adaint.c4
-rw-r--r--gcc/ada/mingw32.h2
3 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 237336de7c8..ecca58d5b66 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-10 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
+
+ * adaint.c (__gnat_get_libraries_from_registry): Cast value
+ to LPBYTE.
+ (__gnat_portable_spawn): Remove const.
+
+ * mingw32.h (MAXPATHLEN): Check for previous definition.
+
2004-10-17 Matthias Klose <doko@debian.org>
* gnatvsn.ads: Set gnat library version to 4.0.
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index a07f008c58a..69b25e25bc9 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -1348,7 +1348,7 @@ __gnat_get_libraries_from_registry (void)
{
value_size = name_size = 256;
res = RegEnumValue (reg_key, index, name, &name_size, 0,
- &type, value, &value_size);
+ &type, (LPBYTE)value, &value_size);
if (res == ERROR_SUCCESS && type == REG_SZ)
{
@@ -1551,7 +1551,7 @@ __gnat_portable_spawn (char *args[])
#if defined (MSDOS) || defined (_WIN32)
/* args[0] must be quotes as it could contain a full pathname with spaces */
- const char *args_0 = args[0];
+ char *args_0 = args[0];
args[0] = (char *)xmalloc (strlen (args_0) + 3);
strcpy (args[0], "\"");
strcat (args[0], args_0);
diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h
index 5febcdfa6f7..7fe531cf97f 100644
--- a/gcc/ada/mingw32.h
+++ b/gcc/ada/mingw32.h
@@ -49,6 +49,8 @@
#define OLD_MINGW (!(STD_MINGW))
+#ifndef MAXPATHLEN
#define MAXPATHLEN MAX_PATH
+#endif
#endif /* _MINGW32_H */