diff options
author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-27 13:16:59 +0000 |
---|---|---|
committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-27 13:16:59 +0000 |
commit | 4c7b1e388f166871b8c8978016f97a84fd3bc87c (patch) | |
tree | fa64f6cafd780002c7a3e891c0d512ba9cabb532 /gcc | |
parent | a8b52821f6b4a27533903ea3cf8f0e776e844a03 (diff) | |
download | gcc-4c7b1e388f166871b8c8978016f97a84fd3bc87c.tar.gz |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61887 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ada/ChangeLog | 11 | ||||
-rw-r--r-- | gcc/ada/adaint.c | 4 | ||||
-rw-r--r-- | gcc/ada/adaint.h | 3 | ||||
-rw-r--r-- | gcc/ada/gmem.c | 2 | ||||
-rw-r--r-- | gcc/ada/init.c | 2 |
5 files changed, 17 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c2b50acafee..60fab087dfa 100644 --- 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 874f0916d21..d820d6d6d58 100644 --- 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 2b5f01a7427..d65be6d729e 100644 --- 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 48d1f62f07d..789a76f1d42 100644 --- 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 04b7aea05aa..ce7b36e2222 100644 --- 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)) |