summaryrefslogtreecommitdiff
path: root/gcc/fortran/primary.c
diff options
context:
space:
mode:
authorburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-13 06:26:38 +0000
committerburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-13 06:26:38 +0000
commit165177fb4444856ed5b4ce00639a0bce7d3b7d76 (patch)
treeb2cea841a63ab6241062fbf35d336b908fd38311 /gcc/fortran/primary.c
parent7c1037d2d4635c84712294b3ded993e0dc0db262 (diff)
downloadgcc-165177fb4444856ed5b4ce00639a0bce7d3b7d76.tar.gz
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-12 Tobias Burnus <burnus@net-b.de> PR libfortran/22423 * io/io.h (namelist_type): Use the proper enum for GFC_DTYPE_*. * intrinsics/iso_c_binding.c (c_f_pointer_u0): Make sure variable is initialized to silence warning. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149545 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/primary.c')
-rw-r--r--gcc/fortran/primary.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index 8013cc86d1e..0d52c6c0940 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;