diff options
| author | kraai <kraai@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-30 00:43:08 +0000 |
|---|---|---|
| committer | kraai <kraai@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-30 00:43:08 +0000 |
| commit | a679e4317ef2f9dfb05f99641f5bcaac81e4f97e (patch) | |
| tree | 3f0c5cfb333419fc813a0b381089414fccd0ce03 | |
| parent | 58179d87f9d8e02bac9c602a8a40bfc8a2b74e5b (diff) | |
| download | gcc-a679e4317ef2f9dfb05f99641f5bcaac81e4f97e.tar.gz | |
* gthr-gnat.c: Remove #undef UNUSED.
(__gnat_default_lock, __gnat_default_unlock): Prototype.
(__gnat_task_lock, __gnat_task_unlock): Make declarations
prototypes.
(__gnat_install_locks): Convert declaration to ISO C90, make
parameter declarations prototypes, and remove blank line.
* gthr-gnat.h (__gnat_install_locks): Make parameter
declarations prototypes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67238 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/gthr-gnat.c | 15 | ||||
| -rw-r--r-- | gcc/gthr-gnat.h | 2 |
3 files changed, 19 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 277eb74853d..fe298df89c3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2003-05-29 Matt Kraai <kraai@alumni.cmu.edu> + + * gthr-gnat.c: Remove #undef UNUSED. + (__gnat_default_lock, __gnat_default_unlock): Prototype. + (__gnat_task_lock, __gnat_task_unlock): Make declarations + prototypes. + (__gnat_install_locks): Convert declaration to ISO C90, make + parameter declarations prototypes, and remove blank line. + * gthr-gnat.h (__gnat_install_locks): Make parameter + declarations prototypes. + 2003-05-29 Jason Merrill <jason@redhat.com> * Makefile.in (unstrap): Remove stage_last after make unstage1. @@ -40,6 +51,7 @@ (expand_unreachable_stmt): Expand unreachable while statements using genrtl_do_stmt_1. +>>>>>>> 1.17950 2003-05-29 Richard Sandiford <rsandifo@redhat.com> * config/mips/mips-protos.h (mips_output_load_label): Declare. diff --git a/gcc/gthr-gnat.c b/gcc/gthr-gnat.c index 9620135bf9b..586e7d1a188 100644 --- a/gcc/gthr-gnat.c +++ b/gcc/gthr-gnat.c @@ -35,6 +35,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define UNUSED(x) x __attribute__((unused)) #endif +void __gnat_default_lock (void); +void __gnat_default_unlock (void); + void __gnat_default_lock (void) { @@ -47,17 +50,14 @@ __gnat_default_unlock (void) return; } -static void (*__gnat_task_lock) () = *__gnat_default_lock; -static void (*__gnat_task_unlock) () = *__gnat_default_unlock; +static void (*__gnat_task_lock) (void) = *__gnat_default_lock; +static void (*__gnat_task_unlock) (void) = *__gnat_default_unlock; void -__gnat_install_locks (lock, unlock) - void (*lock) (); - void (*unlock) (); +__gnat_install_locks (void (*lock) (void), void (*unlock) (void)) { __gnat_task_lock = lock; __gnat_task_unlock = unlock; - } int @@ -79,6 +79,3 @@ __gthread_mutex_unlock (__gthread_mutex_t * UNUSED (mutex)) __gnat_task_unlock (); return 0; } - -#undef UNUSED - diff --git a/gcc/gthr-gnat.h b/gcc/gthr-gnat.h index 0f49227f913..727814197c0 100644 --- a/gcc/gthr-gnat.h +++ b/gcc/gthr-gnat.h @@ -34,7 +34,7 @@ typedef int __gthread_mutex_t; #define __GTHREAD_MUTEX_INIT 0 -extern void __gnat_install_locks (void (*lock) (), void (*unlock) ()); +extern void __gnat_install_locks (void (*lock) (void), void (*unlock) (void)); extern int __gthread_active_p (void); extern int __gthread_mutex_lock (__gthread_mutex_t *); extern int __gthread_mutex_unlock (__gthread_mutex_t *); |