diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/intrinsic.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c35c176..0cacdfc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2004-06-14 Paul Brook <paul@codesourcery.com> + + * intrinsic.c (add_sym_2s): Use correct function types. + 2004-06-12 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> * Make-lang.in (F95_OBJS, F95_PARSER_OBJS): Alphabetize. Move data.c diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c index 7247d89..bf72947 100644 --- a/gcc/fortran/intrinsic.c +++ b/gcc/fortran/intrinsic.c @@ -434,8 +434,8 @@ static void add_sym_2 (const char *name, int elemental, int actual_ok, bt type, static void add_sym_2s (const char *name, int elemental, int actual_ok, bt type, int kind, - try (*check)(gfc_expr *,gfc_expr *,gfc_expr *), - gfc_expr *(*simplify)(gfc_expr *,gfc_expr *,gfc_expr *), + try (*check)(gfc_expr *,gfc_expr *), + gfc_expr *(*simplify)(gfc_expr *,gfc_expr *), void (*resolve)(gfc_code *), const char* a1, bt type1, int kind1, int optional1, const char* a2, bt type2, int kind2, int optional2 @@ -444,8 +444,8 @@ static void add_sym_2s (const char *name, int elemental, int actual_ok, bt type, gfc_simplify_f sf; gfc_resolve_f rf; - cf.f3 = check; - sf.f3 = simplify; + cf.f2 = check; + sf.f2 = simplify; rf.s1 = resolve; add_sym (name, elemental, actual_ok, type, kind, cf, sf, rf, |