summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-05-13 14:25:04 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-05-13 14:25:04 (GMT)
commitdf9d110fd421ba356afdbee34d26eebdc0ca7f73 (patch)
tree409677280ac5dfbf52efb3f2f3dad5f4a067e8e3 /tools
parent2b33e7ca2e8fe529cd3c989564d5e5a1c26180e7 (diff)
downloadhdf5-df9d110fd421ba356afdbee34d26eebdc0ca7f73.zip
hdf5-df9d110fd421ba356afdbee34d26eebdc0ca7f73.tar.gz
hdf5-df9d110fd421ba356afdbee34d26eebdc0ca7f73.tar.bz2
[svn-r18788] Added h5tools.h include to h5diff_common.h to fix warnings about the new progname and status functions
Tested: local linux
Diffstat (limited to 'tools')
-rw-r--r--tools/h5diff/h5diff_common.h18
1 files changed, 16 insertions, 2 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__ */