[svn-r22004] Reduced warnings and fixed conflicts resulting from including h5tools.h

Tested: local linux
2012-02-28 13:26:34 -05:00
parent 9423da6a4d
commit df6c92e506
33 changed files with 327 additions and 309 deletions
--- a/tools/h5diff/ph5diff_main.c
+++ b/tools/h5diff/ph5diff_main.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <assert.h>
 #include "h5diff_common.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"

 /* Name of tool */