summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-12-07 16:26:30 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-12-07 16:26:30 (GMT)
commitbc20a7e47a61bf944259eeb3d3aaab57e840a392 (patch)
tree3d806e0f872d2e67f5d0b6c032da2d43b29bf2fe /hl
parent7d6d3e295634a90e00c19527a9ce3ee990afa1ab (diff)
downloadhdf5-bc20a7e47a61bf944259eeb3d3aaab57e840a392.zip
hdf5-bc20a7e47a61bf944259eeb3d3aaab57e840a392.tar.gz
hdf5-bc20a7e47a61bf944259eeb3d3aaab57e840a392.tar.bz2
Fix windows 10 compile error
Diffstat (limited to 'hl')
-rw-r--r--hl/tools/gif2h5/gif.h24
1 files changed, 18 insertions, 6 deletions
diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h
index ed1cc81..221e178 100644
--- a/hl/tools/gif2h5/gif.h
+++ b/hl/tools/gif2h5/gif.h
@@ -27,16 +27,28 @@
#define MAX_PAL 768
/* typedef H5T_NATIVE_UINT8 BYTE; */
+#ifndef BYTE
typedef unsigned char BYTE;
+#endif
/* typedef H5T_NATIVE_UINT16 WORD; */
+#ifndef WORD
typedef unsigned long WORD;
+#endif
+#ifndef CHAR
typedef char CHAR;
+#endif
+#ifndef boolean
typedef unsigned char boolean;
+#endif
+#ifndef false
#define false 0
+#endif
+#ifndef true
#define true 1
+#endif
/* Set the EndianOrder.
** The GIF Reader file should do this.
@@ -128,12 +140,12 @@ typedef struct _GifCommentExtension {
** extension.
*/
typedef struct _GifToMem {
- GIFHEAD *GifHeader;
- GIFIMAGEDESC **GifImageDesc;
- GIFGRAPHICCONTROL **GifGraphicControlExtension;
- GIFPLAINTEXT **GifPlainTextExtension;
- GIFAPPLICATION **GifApplicationExtension;
- GIFCOMMENT **GifCommentExtension;
+ GIFHEAD *GifHeader;
+ GIFIMAGEDESC **GifImageDesc;
+ GIFGRAPHICCONTROL **GifGraphicControlExtension;
+ GIFPLAINTEXT **GifPlainTextExtension;
+ GIFAPPLICATION **GifApplicationExtension;
+ GIFCOMMENT **GifCommentExtension;
} GIFTOMEM;
/*