diff options
| author | Tobias Burnus <burnus@net-b.de> | 2009-07-13 08:26:38 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2009-07-13 08:26:38 +0200 |
| commit | ffa61a5ee88bced356a16485bdf5702d7ee04b1a (patch) | |
| tree | b2cea841a63ab6241062fbf35d336b908fd38311 /libgfortran | |
| parent | 7c8b1a77881319c8605005ef0730af8c4a522610 (diff) | |
| download | gcc-ffa61a5ee88bced356a16485bdf5702d7ee04b1a.tar.gz | |
re PR fortran/40588 (Small bug in match_charkind_name)
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.
Co-Authored-By: Philippe Marguinaud <philippe.marguinaud@meteo.fr>
From-SVN: r149545
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 9 | ||||
| -rw-r--r-- | libgfortran/intrinsics/iso_c_binding.c | 30 | ||||
| -rw-r--r-- | libgfortran/io/io.h | 2 |
3 files changed, 29 insertions, 12 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6ffd83d40ec..932c85efd7c 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,8 +1,15 @@ +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. + 2009-07-10 Steven G. Kargl <kargl@gcc.gnu.org> * c99_functions.c (ccoshf, ccosh, ccoshl, ctanhf, ctanh, ctanl): Fix errant minus. - + 2009-07-08 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/40330 diff --git a/libgfortran/intrinsics/iso_c_binding.c b/libgfortran/intrinsics/iso_c_binding.c index bb25e3e2d4f..0dd7449df6d 100644 --- a/libgfortran/intrinsics/iso_c_binding.c +++ b/libgfortran/intrinsics/iso_c_binding.c @@ -113,26 +113,36 @@ ISO_C_BINDING_PREFIX (c_f_pointer_u0) (void *c_ptr_in, /* Have to allow for the SHAPE array to be any valid kind for an INTEGER type. */ + switch (size) + { #ifdef HAVE_GFC_INTEGER_1 - if (size == 1) - ub = *((GFC_INTEGER_1 *) p); + case 1: + ub = *((GFC_INTEGER_1 *) p); + break; #endif #ifdef HAVE_GFC_INTEGER_2 - if (size == 2) - ub = *((GFC_INTEGER_2 *) p); + case 2: + ub = *((GFC_INTEGER_2 *) p); + break; #endif #ifdef HAVE_GFC_INTEGER_4 - if (size == 4) - ub = *((GFC_INTEGER_4 *) p); + case 4: + ub = *((GFC_INTEGER_4 *) p); + break; #endif #ifdef HAVE_GFC_INTEGER_8 - if (size == 8) - ub = *((GFC_INTEGER_8 *) p); + case 8: + ub = *((GFC_INTEGER_8 *) p); + break; #endif #ifdef HAVE_GFC_INTEGER_16 - if (size == 16) - ub = *((GFC_INTEGER_16 *) p); + case 16: + ub = *((GFC_INTEGER_16 *) p); + break; #endif + default: + internal_error (NULL, "c_f_pointer_u0: Invalid size"); + } p += source_stride; if (i == 0) diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index 088969a0fca..2a077629a6d 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -163,7 +163,7 @@ format_hash_entry; typedef struct namelist_type { /* Object type, stored as GFC_DTYPE_xxxx. */ - bt type; + dtype type; /* Object name. */ char * var_name; |