summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-01 00:13:18 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-01 00:13:18 (GMT)
commit9cd553e6f8ead0f793d6fd44a972d6533b12c288 (patch)
tree2f69b950bd2fc7831c98f3365c64341af63ddc86
parent21bd3532dd468eda3f32014fdc236d2a003f3521 (diff)
downloadhdf5-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
-rw-r--r--src/H5.c1
-rw-r--r--src/H5make_libsettings.c5
-rw-r--r--src/H5private.h3
3 files changed, 3 insertions, 6 deletions
diff --git a/src/H5.c b/src/H5.c
index 1eb40b2..5dbc371 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -23,6 +23,7 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
+#include "H5lib_settings.h" /* Library build settings */
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
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. */
diff --git a/src/H5private.h b/src/H5private.h
index 504d933..277fe70 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -2260,9 +2260,6 @@ func_init_failed: \
/* Compile-time "assert" macro */
#define HDcompile_assert(e) do { enum { compile_assert__ = 1 / (e) }; } while(0)
-/* Include header for library build settings */
-#include "H5lib_settings.h"
-
/* Private functions, not part of the publicly documented API */
H5_DLL herr_t H5_init_library(void);
H5_DLL void H5_term_library(void);