summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-02-28 18:26:34 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-02-28 18:26:34 (GMT)
commitdf6c92e506a81ed0ede7dacc1269d21ae3e0f411 (patch)
treec67a1ca1bb197289bd955ca4065f0c611dbcdf6e /hl
parent9423da6a4d53cb2eb6c48a9e0d254307bbf8ae9b (diff)
downloadhdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.zip
hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.tar.gz
hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.tar.bz2
[svn-r22004] Reduced warnings and fixed conflicts resulting from including h5tools.h
Tested: local linux
Diffstat (limited to 'hl')
-rw-r--r--hl/tools/gif2h5/gif2hdf.c1
-rw-r--r--hl/tools/gif2h5/gif2mem.c2
-rw-r--r--hl/tools/gif2h5/hdf2gif.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index d5d169e..810be78 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include "gif.h"
+#include "h5tools.h"
#include "h5tools_utils.h"
diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c
index 907fb80..7995bb4 100644
--- a/hl/tools/gif2h5/gif2mem.c
+++ b/hl/tools/gif2h5/gif2mem.c
@@ -37,7 +37,7 @@
#include "gif.h"
-#define VERSION "1.00"
+#define GIF2VERSION "1.00"
GIFTOMEM
Gif2Mem(BYTE *MemGif)
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index a193240..090d657 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -17,6 +17,7 @@
#include <assert.h>
#include "gif.h"
#include "H5IMpublic.h"
+#include "h5tools.h"
#include "h5tools_utils.h"