From 82751ecbb99e4ace41078b7e5307bf258ec91c6b Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Sat, 7 Dec 2019 10:26:30 -0600 Subject: Fix windows 10 compile error --- hl/tools/gif2h5/gif.h | 24 ++++++++++++++++++------ 1 file 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; /* -- cgit v0.12