init.c (__gnat_error_handler): Make msg const.

	* init.c (__gnat_error_handler): Make msg const.

	* gmem.c (convert_addresses): Move declaration ...
	* adaint.h: ... here.
	* adaint.c (convert_addresses): Adapt addrs type to match
	prototype.

	* adaint.c (__gnat_try_lock): Cast pid_t to long, adapt format.

From-SVN: r61887

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c2b50acafeeb795bc56870a9b6b3c98d285508a2..60fab087dfa90b28e28c9a7bb8ddd71337d47c6c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-27  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * init.c (__gnat_error_handler): Make msg const.
+
+       * gmem.c (convert_addresses): Move declaration ...
+       * adaint.h: ... here.
+       * adaint.c (convert_addresses): Adapt addrs type to match
+       prototype.
+
+       * adaint.c (__gnat_try_lock): Cast pid_t to long, adapt format.
+
 2003-01-24  Andreas Schwab  <schwab@suse.de>
 
        * ada-tree.h (SET_TYPE_DIGITS_VALUE): Add intermediate cast to

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 874f0916d218216df2d3cb779a1c29eca42928c2..d820d6d6d583a43d8ba9855a5bb16e2ff2a1c359 100644 (file)
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -366,7 +366,7 @@ __gnat_try_lock (dir, file)
   int fd;
 
   sprintf (full_path, "%s%c%s", dir, DIR_SEPARATOR, file);
-  sprintf (temp_file, "%s-%d-%d", dir, getpid(), getppid ());
+  sprintf (temp_file, "%s-%ld-%ld", dir, (long) getpid(), (long) getppid ());
 
   /* Create the temporary file and write the process number.  */
   fd = open (temp_file, O_CREAT | O_WRONLY, 0600);
@@ -2257,7 +2257,7 @@ int _flush_cache()
 
 void
 convert_addresses (addrs, n_addr, buf, len)
-     void *addrs ATTRIBUTE_UNUSED;
+     char *addrs[] ATTRIBUTE_UNUSED;
      int n_addr ATTRIBUTE_UNUSED;
      void *buf ATTRIBUTE_UNUSED;
      int *len;

diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
index 2b5f01a7427fcc4502ec6130262755dccbb32e14..d65be6d729e60e0c5fc0c76a8e1b4861e01ebee8 100644 (file)
--- a/gcc/ada/adaint.h
+++ b/gcc/ada/adaint.h
@@ -134,6 +134,9 @@ extern void    __gnat_set_binary_mode                  PARAMS ((int));
 extern void    __gnat_set_text_mode               PARAMS ((int));
 extern char   *__gnat_ttyname                     PARAMS ((int));
 
+extern void   convert_addresses                           PARAMS ((char *[], int,
+                                                           void *, int *));
+
 #ifdef IN_RTS
 /* Portable definition of strdup, which is not available on all systems.  */
 #define xstrdup(S)  strcpy ((char *) malloc (strlen (S) + 1), S)

diff --git a/gcc/ada/gmem.c b/gcc/ada/gmem.c
index 48d1f62f07dafffb27ab6942c277c2a88a298213..789a76f1d4270280ad4e620f9d552c4a15dd9f8f 100644 (file)
--- a/gcc/ada/gmem.c
+++ b/gcc/ada/gmem.c
@@ -71,8 +71,6 @@ static FILE *gmemfile;
 static char *tracebk[TB_LEN];
 static int cur_tb_len, cur_tb_pos;
 
-extern void convert_addresses          PARAMS ((char *[], int, void *,
-                                                int *));
 static void gmem_read_backtrace        PARAMS ((void));
 static char *spc2nul                   PARAMS ((char *));
 

diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 04b7aea05aaaae9e9a32d31dec184bb51f7ef863..ce7b36e22229d288a28a506da5e38de443a341cc 100644 (file)
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -1099,7 +1099,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))