From df9d110fd421ba356afdbee34d26eebdc0ca7f73 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 13 May 2010 09:25:04 -0500 Subject: [svn-r18788] Added h5tools.h include to h5diff_common.h to fix warnings about the new progname and status functions Tested: local linux --- tools/h5diff/h5diff_common.h | 18 ++++++++++++++++-- 1 file 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__ */ -- cgit v0.12