From 6ce6f90de84afba6c41f5ae7e8d09b011353fcce Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 15 Jun 2009 11:56:13 -0500 Subject: [svn-r17051] merge changes from the trunk into the branch svn merge -r 16797:17050 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran platforms tested: smirom: ifort, icc --- configure | 2 +- fortran/src/H5match_types.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 1463110..14eae9e 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 17020 2009-06-09 20:15:09Z koziol . +# From configure.in Id: configure.in 17048 2009-06-14 21:06:17Z lrknox . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.8.3-snap3. # diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c index 091d0c8..d6b7a85 100644 --- a/fortran/src/H5match_types.c +++ b/fortran/src/H5match_types.c @@ -102,13 +102,13 @@ endFfile(void) /* Define a c_int_x type in the C header */ void writeTypedef(const char* c_type, unsigned int size) { - fprintf(c_header, "#define c_int_%d %s\n", size, c_type); + fprintf(c_header, "#define c_int_%u %s\n", size, c_type); } /* Define a c_float_x type in the C header */ void writeFloatTypedef(const char* c_type, unsigned int size) { - fprintf(c_header, "#define c_float_%d %s\n", size, c_type); + fprintf(c_header, "#define c_float_%u %s\n", size, c_type); } /* Call this function if there is no matching C type for sizes > 1 */ @@ -116,22 +116,22 @@ void writeTypedefDefault(unsigned int size) { assert(size %2 == 0); - fprintf(c_header, "typedef struct {c_int_%d a; c_int_%d b;} c_int_%d\n", size / 2, size / 2, size); + fprintf(c_header, "typedef struct {c_int_%u a; c_int_%u b;} c_int_%u\n", size / 2, size / 2, size); } /* Create matching Fortran and C types by writing to both files */ void writeToFiles(const char* fortran_type, const char* c_type, unsigned int size) { - fprintf(fort_header, " INTEGER, PARAMETER :: %s = %d\n", fortran_type, size); - fprintf(c_header, "typedef c_int_%d %s;\n", size, c_type); + fprintf(fort_header, " INTEGER, PARAMETER :: %s = %u\n", fortran_type, size); + fprintf(c_header, "typedef c_int_%u %s;\n", size, c_type); } /* Create matching Fortran and C floating types by writing to both files */ void writeFloatToFiles(const char* fortran_type, const char* c_type, unsigned int size) { - fprintf(fort_header, " INTEGER, PARAMETER :: %s = %d\n", fortran_type, size); + fprintf(fort_header, " INTEGER, PARAMETER :: %s = %u\n", fortran_type, size); - fprintf(c_header, "typedef c_float_%d %s;\n", size, c_type); + fprintf(c_header, "typedef c_float_%u %s;\n", size, c_type); } int main() -- cgit v0.12