From f421ba6111c2f5f7ed7bdb5773642e45b6424a8b Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 28 Jun 2010 07:52:16 -0500 Subject: [svn-r19032] Correct use of variable in windows dll builds by changing qualifier from extern to H5_DLLVAR. Turned off default packed bits setting as feature is not available for trunk --- Resources/cacheinit.cmake | 2 +- src/H5ACprivate.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/cacheinit.cmake b/Resources/cacheinit.cmake index 23e6aed..7ca38e1 100755 --- a/Resources/cacheinit.cmake +++ b/Resources/cacheinit.cmake @@ -30,6 +30,6 @@ SET (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE) SET (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE) -SET (HDF5_USE_H5DUMP_PACKED_BITS ON CACHE BOOL "Use the PACKED BITS feature in h5dump" FORCE) +SET (HDF5_USE_H5DUMP_PACKED_BITS OFF CACHE BOOL "Use the PACKED BITS feature in h5dump" FORCE) SET (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE) diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index c59f681..ef19480 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -217,7 +217,7 @@ extern hid_t H5AC_dxpl_id; /* Dataset transfer property list for independent metadata I/O calls */ /* (just "library internal" set - i.e. independent transfer mode) */ /* (Global variable declaration, definition is in H5AC.c) */ -extern hid_t H5AC_ind_dxpl_id; +H5_DLLVAR hid_t H5AC_ind_dxpl_id; /* Default cache configuration. */ -- cgit v0.12