diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-01 00:13:18 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-01 00:13:18 (GMT) |
| commit | 9cd553e6f8ead0f793d6fd44a972d6533b12c288 (patch) | |
| tree | 2f69b950bd2fc7831c98f3365c64341af63ddc86 /src/H5make_libsettings.c | |
| parent | 21bd3532dd468eda3f32014fdc236d2a003f3521 (diff) | |
| download | hdf5-9cd553e6f8ead0f793d6fd44a972d6533b12c288.zip hdf5-9cd553e6f8ead0f793d6fd44a972d6533b12c288.tar.gz hdf5-9cd553e6f8ead0f793d6fd44a972d6533b12c288.tar.bz2 | |
[svn-r18475] Description:
Fix dependency issue and non-C99 coding goof.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5make_libsettings.c')
| -rw-r--r-- | src/H5make_libsettings.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c index 8782157..49b17bd 100644 --- a/src/H5make_libsettings.c +++ b/src/H5make_libsettings.c @@ -41,9 +41,6 @@ static const char *FileHeader = "\n\ *------------------------------------------------------------------------- */ -/* Avoid trying to include the header file we are going to generate. :-) */ -#define _H5lib_settings_H - #include <stdio.h> #include <time.h> #include "H5private.h" @@ -73,6 +70,7 @@ insert_libhdf5_settings(FILE *flibinfo) fprintf(flibinfo, "extern const char H5libhdf5_settings[];\n"); fprintf(flibinfo, "#else /* H5_LIBSETTINGS_OWNER */\n"); #ifdef H5_HAVE_EMBEDDED_LIBINFO +{ FILE *fsettings; /* for files libhdf5.settings */ int inchar; int bol = 0; /* indicates the beginning of a new line */ @@ -115,6 +113,7 @@ insert_libhdf5_settings(FILE *flibinfo) HDperror(LIBSETTINGSFNAME); HDexit(1); } /* end if */ +} #else /* print variable definition and an empty string */ /* Do not use static else AIX strings does not show it. */ |