summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-06-28 12:52:16 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-06-28 12:52:16 (GMT)
commitf421ba6111c2f5f7ed7bdb5773642e45b6424a8b (patch)
tree5b574978ea5521577310ba32cca1480cdec87975
parent732eaaf99b73ddfecbd2406a23b49636dca18e16 (diff)
downloadhdf5-f421ba6111c2f5f7ed7bdb5773642e45b6424a8b.zip
hdf5-f421ba6111c2f5f7ed7bdb5773642e45b6424a8b.tar.gz
hdf5-f421ba6111c2f5f7ed7bdb5773642e45b6424a8b.tar.bz2
[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
-rwxr-xr-xResources/cacheinit.cmake2
-rw-r--r--src/H5ACprivate.h2
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. */