diff options
| -rw-r--r-- | tools/h5diff/h5diff_common.h | 18 | ||||
| -rw-r--r-- | tools/lib/h5tools.h | 7 |
2 files changed, 20 insertions, 5 deletions
diff --git a/tools/h5diff/h5diff_common.h b/tools/h5diff/h5diff_common.h index 2796bd5..5a601df 100644 --- a/tools/h5diff/h5diff_common.h +++ b/tools/h5diff/h5diff_common.h @@ -13,11 +13,25 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -extern unsigned char g_Parallel; -extern int g_nTasks; +#ifndef H5DIFFCOMMON_H__ +#define H5DIFFCOMMON_H__ + +#include "h5tools.h" + +#ifdef __cplusplus +extern "C" { +#endif + +H5TOOLS_DLLVAR unsigned char g_Parallel; +H5TOOLS_DLLVAR int g_nTasks; void usage(void); void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* options); void h5diff_exit(int status); void print_info(diff_opt_t* options); +#ifdef __cplusplus +} +#endif + +#endif /* H5DIFFCOMMON_H__ */ diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index d1b569c..16dabd0 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -524,10 +524,11 @@ struct subset_t { #ifdef __cplusplus extern "C" { #endif + #ifdef H5_HAVE_H5DUMP_PACKED_BITS -extern int packed_output; /* packed bits output count */ -extern int packed_normalize; /* number of bits to shift right to display normalized */ -extern unsigned int packed_counter; /* counter for which packed bits to display */ +H5TOOLS_DLLVAR int packed_output; /* packed bits output count */ +H5TOOLS_DLLVAR int packed_normalize; /* number of bits to shift right to display normalized */ +H5TOOLS_DLLVAR unsigned int packed_counter; /* counter for which packed bits to display */ #endif H5TOOLS_DLLVAR FILE *rawdatastream; /* output stream for raw data */ |