mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r18475] Description:

Browse Source 
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
This commit is contained in:
Quincey Koziol 2010-03-31 19:13:18 -05:00
parent 21bd3532dd
commit 9cd553e6f8
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/H5.c
View File

@ -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 */

5
src/H5make_libsettings.c
View File

@ -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. */

3
src/H5private.h
View File

@ -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);