Merge pull request #2154 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12

* commit 'dd6b6ce61ca1a6af8e872ad09ef5da6ca437e9bc':
  Adjust cache.c only variables.
  Fix include to correct memory calls - big-endian issue.

4 files changed, 28 insertions, 31 deletions

diff --git a/test/cache.c b/test/cache.c
index ca2cf13..a90f12b 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -18,24 +18,38 @@
  *        H5C.c
  */
 #include "cache_common.h"
+#include "H5MFprivate.h"
 
 
+H5C_t * saved_cache = NULL; /* store the pointer to the instance of
+                             * of H5C_t created by H5Fcreate()
+                             * here between test cache setup and
+                             * shutdown.
+                             */
+
+haddr_t saved_actual_base_addr = HADDR_UNDEF;   /* Store the address of the
+                                                 * space allocated for cache items in the file between
+                                                 * cache setup & takedown
+                                                 */
+
 hid_t saved_fapl_id = H5P_DEFAULT; /* store the fapl id here between
-                    * cache setup and takedown.  Note
-                    * that if saved_fapl_id == H5P_DEFAULT,
-                    * we assume that there is no fapl to
-                    * close.
-                    */
+                                    * cache setup and takedown.  Note
+                                    * that if saved_fapl_id == H5P_DEFAULT,
+                                    * we assume that there is no fapl to
+                                    * close.
+                                    */
 
 hid_t saved_fcpl_id = H5P_DEFAULT; /* store the fcpl id here between
-                    * cache setup and takedown.  Note
-                    * that if saved_fcpl_id == H5P_DEFAULT,
-                    * we assume that there is no fcpl to
-                    * close.
-                    */
-hid_t saved_fid = -1; /* store the file id here between cache setup
-            * and takedown.
-            */
+                                    * cache setup and takedown.  Note
+                                    * that if saved_fcpl_id == H5P_DEFAULT,
+                                    * we assume that there is no fcpl to
+                                    * close.
+                                    */
+
+hid_t saved_fid = -1;  /* store the file id here between cache setup
+                        * and takedown.
+                        */
+hbool_t write_permitted = TRUE;
 hbool_t try_core_file_driver = FALSE;
 hbool_t core_file_driver_failed = FALSE;
 
diff --git a/test/cache_common.c b/test/cache_common.c
index 96c146c..f977c3c 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -18,23 +18,10 @@
  *        implemented in H5C.c
  */
 #include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5MFprivate.h"
 #include "H5MMprivate.h"
 
 #include "cache_common.h"
 
-
-H5C_t * saved_cache = NULL; /* store the pointer to the instance of
-                    * of H5C_t created by H5Fcreate()
-                * here between test cache setup and
-                * shutdown.
-                */
-
-haddr_t saved_actual_base_addr = HADDR_UNDEF;   /* Store the address of the
-                            space allocated for cache items in the file between
-                            cache setup & takedown */
-
-hbool_t write_permitted = TRUE;
 hbool_t pass = TRUE; /* set to false on error */
 const char *failure_mssg = NULL;
 
diff --git a/test/cache_common.h b/test/cache_common.h
index 61457d9..969cc2a 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -538,10 +538,6 @@ struct expected_entry_status
 
 
 /* global variable externs: */
-H5TEST_DLLVAR H5C_t * saved_cache;
-
-H5TEST_DLLVAR haddr_t saved_actual_base_addr;
-H5TEST_DLLVAR hbool_t write_permitted;
 H5TEST_DLLVAR hbool_t pass; /* set to false on error */
 H5TEST_DLLVAR const char *failure_mssg;
 
diff --git a/test/cache_image.c b/test/cache_image.c
index 59689a9..9f8c4c5 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -15,7 +15,7 @@
  *              7/13/15
  *
  *              This file contains tests specific to the cache image
- *        feature implemented in H5C.c
+ *              feature implemented in H5C.c
  */
 #include "cache_common.h"
 #include "genall5.h"