diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/libgfortran.h | 5 | ||||
| -rw-r--r-- | gcc/fortran/primary.c | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ec4502f..2206931 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2009-07-12 Tobias Burnus <burnus@net-b.de> + Philippe Marguinaud <philippe.marguinaud@meteo.fr> + + PR fortran/40588 + * primary.c (match_charkind_name): Fix condition for $ matching. + + PR libfortran/22423 + * libgfortran.h: Typedef the GFC_DTYPE_* enum. + 2009-07-11 Tobias Burnus <burnus@net-b.de> PR fortran/33197 diff --git a/gcc/fortran/libgfortran.h b/gcc/fortran/libgfortran.h index a18fdce..d660207 100644 --- a/gcc/fortran/libgfortran.h +++ b/gcc/fortran/libgfortran.h @@ -110,7 +110,7 @@ libgfortran_error_codes; #define GFC_DTYPE_TYPE_MASK 0x38 #define GFC_DTYPE_SIZE_SHIFT 6 -enum +typedef enum { GFC_DTYPE_UNKNOWN = 0, GFC_DTYPE_INTEGER, @@ -120,5 +120,6 @@ enum GFC_DTYPE_COMPLEX, GFC_DTYPE_DERIVED, GFC_DTYPE_CHARACTER -}; +} +dtype; diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 8013cc8..0d52c6c 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -832,7 +832,7 @@ match_charkind_name (char *name) if (!ISALNUM (c) && c != '_' - && (gfc_option.flag_dollar_ok && c != '$')) + && (c != '$' || !gfc_option.flag_dollar_ok)) break; *name++ = c; |