diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2017-04-17 21:41:37 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2017-04-17 21:41:37 (GMT) |
| commit | 216dcd6d308311b21d47f7faff25c3322749255c (patch) | |
| tree | c23e7f1cb88e5061c140f2ceb2f7f5c378ac5f73 | |
| parent | d33067792c8999d922d129430d91307990185051 (diff) | |
| parent | 66092af9dd3ff3d5169ca4ccf60e9272a813c10d (diff) | |
| download | hdf5-216dcd6d308311b21d47f7faff25c3322749255c.zip hdf5-216dcd6d308311b21d47f7faff25c3322749255c.tar.gz hdf5-216dcd6d308311b21d47f7faff25c3322749255c.tar.bz2 | |
Merge pull request #432 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10_1 to hdf5_1_10_1
* commit '66092af9dd3ff3d5169ca4ccf60e9272a813c10d':
HDFFV-10170 fix noinst libs and HDFFV-10173 fix VS2008 build
| -rw-r--r-- | src/H5ACpublic.h | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h index 301d713..c8276cf 100644 --- a/src/H5ACpublic.h +++ b/src/H5ACpublic.h @@ -561,10 +561,10 @@ typedef struct H5AC_cache_config_t #define H5AC__CACHE_IMAGE__ENTRY_AGEOUT__MAX 100 typedef struct H5AC_cache_image_config_t { - int32_t version; + int version; hbool_t generate_image; hbool_t save_resize_status; - int32_t entry_ageout; + int entry_ageout; } H5AC_cache_image_config_t; #ifdef __cplusplus diff --git a/test/Makefile.am b/test/Makefile.am index 630519d..0d85117 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -104,15 +104,12 @@ if HAVE_SHARED_CONDITIONAL # The libdynlib1, libdynlib2, libdynlib3, and libdynlib4 library for testing plugin module plugin.c. # Build it as shared library if configure is enabled for shared library. - lib_LTLIBRARIES=libdynlib1.la libdynlib2.la libdynlib3.la libdynlib4.la + noinst_LTLIBRARIES+=libdynlib1.la libdynlib2.la libdynlib3.la libdynlib4.la libdynlib1_la_SOURCES=dynlib1.c libdynlib2_la_SOURCES=dynlib2.c libdynlib3_la_SOURCES=dynlib3.c libdynlib4_la_SOURCES=dynlib4.c -install-exec-hook: - $(RM) $(DESTDIR)$(libdir)/*dynlib* - else # The libh5test library provides common support code for the tests. noinst_LTLIBRARIES=libh5test.la |