diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2013-07-31 17:21:24 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-07-31 17:21:24 (GMT) |
| commit | 3146ddb5c2fc5e57b72eb2ecce697a7016f92b3a (patch) | |
| tree | 86ee712cb09b010cf9ac1b41b0c0571505bc372a /src | |
| parent | 66310368341199e259b793b13e8f06b2e3e491c4 (diff) | |
| download | hdf5-3146ddb5c2fc5e57b72eb2ecce697a7016f92b3a.zip hdf5-3146ddb5c2fc5e57b72eb2ecce697a7016f92b3a.tar.gz hdf5-3146ddb5c2fc5e57b72eb2ecce697a7016f92b3a.tar.bz2 | |
[svn-r23954] Bring revisions #23715 - 23745 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/H5PL.c | 2 | ||||
| -rw-r--r-- | src/H5Tnative.c | 2 | ||||
| -rw-r--r-- | src/H5public.h | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 828d2f0..7535138 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -787,6 +787,7 @@ INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}) # specific type checks inside #----------------------------------------------------------------------------- ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c) +TARGET_C_PROPERTIES (H5detect " " " ") IF (MSVC) TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib") ENDIF (MSVC) @@ -800,6 +801,7 @@ ADD_CUSTOM_COMMAND ( ) ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) +TARGET_C_PROPERTIES (H5make_libsettings " " " ") IF (MSVC) TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib") ENDIF (MSVC) @@ -849,6 +851,7 @@ SET (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5overflow.h) SET_SOURCE_FILES_PROPERTIES (${HDF5_BINARY_DIR}/H5overflow.h GENERATED) ADD_LIBRARY (${HDF5_LIB_TARGET} ${LIB_TYPE} ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS}) +TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} " " " ") TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} ${LINK_LIBS}) IF (NOT WIN32) TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} dl) @@ -456,7 +456,7 @@ H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info) FUNC_ENTER_STATIC /* Specify a file mask. *.* = We want everything! */ - sprintf(service, "%s\/*.dll", dir); + sprintf(service, "%s\\*.dll", dir); if((hFind = FindFirstFile(service, &fdFile)) == INVALID_HANDLE_VALUE) HGOTO_ERROR(H5E_PLUGIN, H5E_OPENERROR, FAIL, "can't open directory") diff --git a/src/H5Tnative.c b/src/H5Tnative.c index e7d1351..1a97f39 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -383,7 +383,7 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig /* Find the conversion function */ if(NULL == (tpath = H5T_path_find(super_type, nat_super_type, NULL, NULL, H5P_DEFAULT, FALSE))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert between src and dst data types") + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to convert between src and dst data types") /* Retrieve member info and insert members into new enum type */ if((snmemb = H5T_get_nmembers(dtype)) <= 0) diff --git a/src/H5public.h b/src/H5public.h index 345e3ff..80d0a29 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -75,10 +75,10 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 9 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 152 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_RELEASE 154 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "FA_a5" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.9.152-FA_a5" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.9.154-FA_a5" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/src/Makefile.in b/src/Makefile.in index 2156c8f..d7b0eb0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -525,7 +525,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 142 +LT_VERS_REVISION = 144 LT_VERS_AGE = 0 H5detect_CFLAGS = -g $(AM_CFLAGS) |