This commit was generated by cvs2svn to compensate for changes in r132718,

which included commits to RCS files with non-trunk default branches.

1 files changed, 21 insertions, 23 deletions

diff --git a/contrib/gcc/f/symbol.c b/contrib/gcc/f/symbol.c
index 816ad19..c22697f 100644
--- a/contrib/gcc/f/symbol.c
+++ b/contrib/gcc/f/symbol.c
@@ -1,5 +1,6 @@
 /* Implementation of Fortran symbol manager
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2003
+   Free Software Foundation, Inc.
    Contributed by James Craig Burley.
 
 This file is part of GNU Fortran.
@@ -177,7 +178,7 @@ ffesymbol_check_token_ (ffelexToken t, char *c)
 /* Kill manifest (g77-picked) names.  */
 
 static void
-ffesymbol_kill_manifest_ ()
+ffesymbol_kill_manifest_ (void)
 {
   if (ffesymbol_token_blank_common_ != NULL)
     ffelex_token_kill (ffesymbol_token_blank_common_);
@@ -205,8 +206,7 @@ ffesymbol_new_ (ffename n)
 
   assert (n != NULL);
 
-  s = (ffesymbol) malloc_new_ks (FFESYMBOL_SPACE_POOL_, "FFESYMBOL",
-				 sizeof (*s));
+  s = malloc_new_ks (FFESYMBOL_SPACE_POOL_, "FFESYMBOL", sizeof (*s));
   s->name = n;
   s->other_space_name = NULL;
 #if FFEGLOBAL_ENABLED
@@ -230,9 +230,7 @@ ffesymbol_new_ (ffename n)
   s->common = NULL;
   s->equiv = NULL;
   s->storage = NULL;
-#ifdef FFECOM_symbolHOOK
   s->hook = FFECOM_symbolNULL;
-#endif
   s->sfa_dummy_parent = NULL;
   s->func_result = NULL;
   s->value = 0;
@@ -259,8 +257,8 @@ ffesymbol_new_ (ffename n)
       return s;
     }
 
-  r = (ffesymbolRetract_) malloc_new_kp (ffesymbol_retract_pool_,
-					 "FFESYMBOL retract", sizeof (*r));
+  r = malloc_new_kp (ffesymbol_retract_pool_, "FFESYMBOL retract",
+		     sizeof (*r));
   r->next = NULL;
   r->command = FFESYMBOL_retractcommandDELETE_;
   r->live = s;
@@ -823,7 +821,7 @@ ffesymbol_error (ffesymbol s, ffelexToken t)
 }
 
 void
-ffesymbol_init_0 ()
+ffesymbol_init_0 (void)
 {
   ffesymbolAttrs attrs = FFESYMBOL_attrsetNONE;
 
@@ -835,7 +833,7 @@ ffesymbol_init_0 ()
 }
 
 void
-ffesymbol_init_1 ()
+ffesymbol_init_1 (void)
 {
 #if FFESYMBOL_globalCURRENT_ == FFESYMBOL_globalFILE_
   ffesymbol_global_ = ffename_space_new (ffe_pool_file ());
@@ -843,12 +841,12 @@ ffesymbol_init_1 ()
 }
 
 void
-ffesymbol_init_2 ()
+ffesymbol_init_2 (void)
 {
 }
 
 void
-ffesymbol_init_3 ()
+ffesymbol_init_3 (void)
 {
 #if FFESYMBOL_globalCURRENT_ == FFESYMBOL_globalPROGUNIT_
   ffesymbol_global_ = ffename_space_new (ffe_pool_program_unit ());
@@ -857,7 +855,7 @@ ffesymbol_init_3 ()
 }
 
 void
-ffesymbol_init_4 ()
+ffesymbol_init_4 (void)
 {
   ffesymbol_sfunc_ = ffename_space_new (ffe_pool_program_unit ());
 }
@@ -1061,7 +1059,7 @@ ffesymbol_retract (bool retract)
 /* Return retractable flag.  */
 
 bool
-ffesymbol_retractable ()
+ffesymbol_retractable (void)
 {
   return ffesymbol_retractable_;
 }
@@ -1105,13 +1103,13 @@ ffesymbol_signal_change (ffesymbol s)
   if (!ffesymbol_retractable_ || s->have_old)
     return;
 
-  r = (ffesymbolRetract_) malloc_new_kp (ffesymbol_retract_pool_,
-					 "FFESYMBOL retract", sizeof (*r));
+  r = malloc_new_kp (ffesymbol_retract_pool_, "FFESYMBOL retract",
+		     sizeof (*r));
   r->next = NULL;
   r->command = FFESYMBOL_retractcommandRETRACT_;
   r->live = s;
-  r->symbol = sym = (ffesymbol) malloc_new_ks (FFESYMBOL_SPACE_POOL_,
-					       "FFESYMBOL", sizeof (*sym));
+  r->symbol = sym = malloc_new_ks (FFESYMBOL_SPACE_POOL_,
+				   "FFESYMBOL", sizeof (*sym));
   *sym = *s;			/* Make an exact copy of the symbol in case
 				   we need it back. */
   sym->info = ffeinfo_use (s->info);
@@ -1135,12 +1133,12 @@ ffesymbol_state_string (ffesymbolState state)
 }
 
 void
-ffesymbol_terminate_0 ()
+ffesymbol_terminate_0 (void)
 {
 }
 
 void
-ffesymbol_terminate_1 ()
+ffesymbol_terminate_1 (void)
 {
 #if FFESYMBOL_globalCURRENT_ == FFESYMBOL_globalFILE_
   ffename_space_drive_symbol (ffesymbol_global_, ffesymbol_unhook_);
@@ -1152,7 +1150,7 @@ ffesymbol_terminate_1 ()
 }
 
 void
-ffesymbol_terminate_2 ()
+ffesymbol_terminate_2 (void)
 {
 #if FFESYMBOL_globalCURRENT_ == FFESYMBOL_globalPROGUNIT_
   ffesymbol_kill_manifest_ ();
@@ -1160,7 +1158,7 @@ ffesymbol_terminate_2 ()
 }
 
 void
-ffesymbol_terminate_3 ()
+ffesymbol_terminate_3 (void)
 {
 #if FFESYMBOL_globalCURRENT_ == FFESYMBOL_globalPROGUNIT_
   ffename_space_drive_symbol (ffesymbol_global_, ffesymbol_unhook_);
@@ -1175,7 +1173,7 @@ ffesymbol_terminate_3 ()
 }
 
 void
-ffesymbol_terminate_4 ()
+ffesymbol_terminate_4 (void)
 {
   ffename_space_drive_symbol (ffesymbol_sfunc_, ffesymbol_unhook_);
   ffename_space_kill (ffesymbol_sfunc_);