tracebak.c (MAX): Avoid redefinition warning.

	* tracebak.c (MAX): Avoid redefinition warning.

	* init.c [sgi] (__gnat_error_handler): Remove i, unused.
	Change msg to const char *.
	(__gnat_install_handler): Remove ss, unused.
	[sun && __SVR4 && !__vxworks] (__gnat_error_handler): Change msg
	to const char *.
	* cstreams.c (__gnat_full_name): Declare p only when used.
	(__gnat_full_name) [sgi] Return buffer.

From-SVN: r72794

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index fe7650b0f7f07dbc6d305fbd9ab2f77a48385d7d..cbb215eb9e9aecf048ed920d0c066ce5c3627af9 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-22  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * tracebak.c (MAX): Avoid redefinition warning.
+
+       * init.c [sgi] (__gnat_error_handler): Remove i, unused.
+       Change msg to const char *.
+       (__gnat_install_handler): Remove ss, unused.
+       [sun && __SVR4 && !__vxworks] (__gnat_error_handler): Change msg
+       to const char *.
+       * cstreams.c (__gnat_full_name): Declare p only when used.
+       (__gnat_full_name) [sgi] Return buffer.
+
 2003-10-22  Arnaud Charlet  <charlet@act-europe.fr>
 
        * mingw32.h: New file.

diff --git a/gcc/ada/cstreams.c b/gcc/ada/cstreams.c
index 0e85c09dba54fc596c159c9f8534c14f2e3267d3..755b6b57ea22826d53c317fe6e102faaa660d86b 100644 (file)
--- a/gcc/ada/cstreams.c
+++ b/gcc/ada/cstreams.c
@@ -162,9 +162,9 @@ __gnat_full_name (nam, buffer)
      char *nam;
      char *buffer;
 {
+#if defined(__EMX__) || defined (__MINGW32__)
   char *p;
 
-#if defined(__EMX__) || defined (__MINGW32__)
   /* If this is a device file return it as is; under Windows NT and
      OS/2 a device file end with ":".  */
   if (nam[strlen (nam) - 1] == ':')
@@ -189,6 +189,7 @@ __gnat_full_name (nam, buffer)
      getcwd approach instead. */
   realpath (nam, buffer);
 
+  return buffer;
 #elif defined (VMS)
   strncpy (buffer, __gnat_to_canonical_file_spec (nam), __gnat_max_path_len);
 
@@ -209,6 +210,8 @@ __gnat_full_name (nam, buffer)
   return buffer;
 
 #else
+  char *p;
+
   if (nam[0] != '/')
     {
       p = getcwd (buffer, __gnat_max_path_len);

diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 786c7915d844769dec539696a1390b4c5e89ef91..6995b8c7ca3d90e3b919dc0f29fbfb6c27f86f60 100644 (file)
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -1062,9 +1062,7 @@ __gnat_error_handler (sig, code, sc)
 {
   struct Machine_State  *mstate;
   struct Exception_Data *exception;
-  char *msg;
-
-  int i;
+  const char *msg;
 
   switch (sig)
     {
@@ -1142,7 +1140,6 @@ __gnat_error_handler (sig, code, sc)
 void
 __gnat_install_handler ()
 {
-  stack_t ss;
   struct sigaction act;
 
   /* Setup signal handler to map synchronous signals to appropriate
@@ -1194,7 +1191,7 @@ __gnat_error_handler (sig, sip)
 {
   struct Exception_Data *exception;
   static int recurse = 0;
-  char *msg;
+  const char *msg;
 
   /* If this was an explicit signal from a "kill", just resignal it.  */
   if (SI_FROMUSER (sip))

diff --git a/gcc/ada/tracebak.c b/gcc/ada/tracebak.c
index 0df46e2fad936efe2ac6d30a6e3cb52f43fc8af3..5c9b9f690b44a7ef073be236b93ca56e404411d7 100644 (file)
--- a/gcc/ada/tracebak.c
+++ b/gcc/ada/tracebak.c
@@ -327,7 +327,9 @@ extern unsigned int _image_base__;
 #define VALID_STACK_FRAME(ptr) 1
 #endif
 
+#ifndef MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
+#endif
 
 /* Define a dummy function to call if FORCE_CALL is defined.  Don't
    define it otherwise, as this could lead to "defined but not used"