Windows cleanup

* A splitter VFD test in vfd.c fails
* Several vfd_swmr.c tests are #ifdef'd around

1 files changed, 39 insertions, 23 deletions

diff --git a/test/genall5.h b/test/genall5.h
index 43fe15d..2c37b50 100644
--- a/test/genall5.h
+++ b/test/genall5.h
@@ -15,6 +15,9 @@
  * This file contains declarations of all functions defined in genall5.c
  */
 
+#ifndef GENALL5_H
+#define GENALL5_H
+
 typedef struct _zoo_config {
     int proc_num;
     bool continue_on_failure;
@@ -26,43 +29,56 @@ typedef struct _zoo_config {
                                  */
 } zoo_config_t;
 
-bool create_zoo(hid_t, const char *, struct timespec *, zoo_config_t);
-bool validate_zoo(hid_t, const char *, struct timespec *, zoo_config_t);
-bool delete_zoo(hid_t, const char *, struct timespec *, zoo_config_t);
-bool validate_deleted_zoo(hid_t, const char *, struct timespec *,
+/**************/
+/* Prototypes */
+/**************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+H5TEST_DLL hbool_t create_zoo(hid_t, const char *, struct timespec *, zoo_config_t);
+H5TEST_DLL hbool_t validate_zoo(hid_t, const char *, struct timespec *, zoo_config_t);
+H5TEST_DLL hbool_t delete_zoo(hid_t, const char *, struct timespec *, zoo_config_t);
+H5TEST_DLL hbool_t validate_deleted_zoo(hid_t, const char *, struct timespec *,
     zoo_config_t);
 
-bool ns_grp_0(hid_t fid, const char *group_name);
-bool vrfy_ns_grp_0(hid_t fid, const char *group_name);
+H5TEST_DLL hbool_t ns_grp_0(hid_t fid, const char *group_name);
+H5TEST_DLL hbool_t vrfy_ns_grp_0(hid_t fid, const char *group_name);
 
-bool ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks);
-bool vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks);
+H5TEST_DLL hbool_t ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks);
+H5TEST_DLL hbool_t vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks);
 
-bool ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks);
-bool vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks);
+H5TEST_DLL hbool_t ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks);
+H5TEST_DLL hbool_t vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks);
 
-bool os_grp_0(hid_t fid, const char *group_name);
-bool vrfy_os_grp_0(hid_t fid, const char *group_name);
+H5TEST_DLL hbool_t os_grp_0(hid_t fid, const char *group_name);
+H5TEST_DLL hbool_t vrfy_os_grp_0(hid_t fid, const char *group_name);
 
-bool os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks);
-bool vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num,
+H5TEST_DLL hbool_t os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks);
+H5TEST_DLL hbool_t vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num,
     unsigned nlinks);
 
-bool ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data);
-bool vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data);
 
-bool ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data);
-bool vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data);
 
-bool ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data);
-bool vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data);
 
-bool ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data);
-bool vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data);
+H5TEST_DLL hbool_t vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data);
 
 /* Individual tests can override zoo_create_hook(), which is called
  * after each step of create_zoo().  The `hid_t` argument identifies
  * the file where the step was performed.  The test library provides a
  * default implementation of zoo_create_hook() that does nothing.
  */
-void zoo_create_hook(hid_t);
+H5TEST_DLL void zoo_create_hook(hid_t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GENALL5_H */