diff options
Diffstat (limited to 'contrib/gcc/f/global.c')
| -rw-r--r-- | contrib/gcc/f/global.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/contrib/gcc/f/global.c b/contrib/gcc/f/global.c index 1fe9270..8793f62 100644 --- a/contrib/gcc/f/global.c +++ b/contrib/gcc/f/global.c @@ -1,5 +1,5 @@ /* global.c -- Implementation File (module.c template V1.0) - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2003 Free Software Foundation, Inc. Contributed by James Craig Burley. This file is part of GNU Fortran. @@ -62,14 +62,14 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA static ffenameSpace ffeglobal_filewide_ = NULL; static const char *const ffeglobal_type_string_[] = { - [FFEGLOBAL_typeNONE] "??", - [FFEGLOBAL_typeMAIN] "main program", - [FFEGLOBAL_typeEXT] "external", - [FFEGLOBAL_typeSUBR] "subroutine", - [FFEGLOBAL_typeFUNC] "function", - [FFEGLOBAL_typeBDATA] "block data", - [FFEGLOBAL_typeCOMMON] "common block", - [FFEGLOBAL_typeANY] "?any?" + [FFEGLOBAL_typeNONE] = "??", + [FFEGLOBAL_typeMAIN] = "main program", + [FFEGLOBAL_typeEXT] = "external", + [FFEGLOBAL_typeSUBR] = "subroutine", + [FFEGLOBAL_typeFUNC] = "function", + [FFEGLOBAL_typeBDATA] = "block data", + [FFEGLOBAL_typeCOMMON] = "common block", + [FFEGLOBAL_typeANY] = "?any?" }; #endif @@ -107,12 +107,9 @@ ffeglobal_new_ (ffename n) assert (n != NULL); - g = (ffeglobal) malloc_new_ks (malloc_pool_image (), "FFEGLOBAL", - sizeof (*g)); + g = malloc_new_ks (malloc_pool_image (), "FFEGLOBAL", sizeof (*g)); g->n = n; -#ifdef FFECOM_globalHOOK g->hook = FFECOM_globalNULL; -#endif g->tick = 0; ffename_set_global (n, g); @@ -126,7 +123,7 @@ ffeglobal_new_ (ffename n) ffeglobal_init_1(); */ void -ffeglobal_init_1 () +ffeglobal_init_1 (void) { #if FFEGLOBAL_ENABLED if (ffeglobal_filewide_ != NULL) @@ -782,10 +779,9 @@ ffeglobal_proc_def_nargs (ffesymbol s, int n_args) return; } - g->u.proc.arg_info - = (ffeglobalArgInfo_) malloc_new_ks (malloc_pool_image (), - "ffeglobalArgInfo_", - n_args * sizeof (g->u.proc.arg_info[0])); + g->u.proc.arg_info = malloc_new_ks (malloc_pool_image (), + "ffeglobalArgInfo_", + n_args * sizeof (g->u.proc.arg_info[0])); while (n_args-- > 0) g->u.proc.arg_info[n_args].t = NULL; } @@ -1125,10 +1121,9 @@ ffeglobal_proc_ref_nargs (ffesymbol s, int n_args, ffelexToken t) return TRUE; } - g->u.proc.arg_info - = (ffeglobalArgInfo_) malloc_new_ks (malloc_pool_image (), - "ffeglobalArgInfo_", - n_args * sizeof (g->u.proc.arg_info[0])); + g->u.proc.arg_info = malloc_new_ks (malloc_pool_image (), + "ffeglobalArgInfo_", + n_args * sizeof (g->u.proc.arg_info[0])); while (n_args-- > 0) g->u.proc.arg_info[n_args].t = NULL; @@ -1430,9 +1425,7 @@ ffeglobal_ref_progunit_ (ffesymbol s, ffelexToken t, ffeglobalType type) /* We've learned more, so point to where we learned it. */ g->t = ffelex_token_use (t); g->type = type; -#ifdef FFECOM_globalHOOK g->hook = FFECOM_globalNULL; /* Discard previous _DECL. */ -#endif g->u.proc.n_args = -1; } @@ -1588,6 +1581,6 @@ ffeglobal_size_common (ffesymbol s, ffetargetOffset size) #endif void -ffeglobal_terminate_1 () +ffeglobal_terminate_1 (void) { } |
