X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fgifrlib.h;h=292a5a40574adf0e7148410f5ba8d574cf9c9717;hb=099e49380bf87248e625016bfd7c6cac8915d280;hp=5b185d77741cdeb69d08ec1aaa237d4f9b282e3f;hpb=669565bfdc5d704dfb1d5ac1a0ec01fb3615a1ae;p=chise%2Fxemacs-chise.git.1

diff --git a/src/gifrlib.h b/src/gifrlib.h
index 5b185d7..292a5a4 100644
--- a/src/gifrlib.h
+++ b/src/gifrlib.h
@@ -14,8 +14,8 @@
 * 19 Jan 98 - Version 3.1 by Jareth Hein (Support for user-defined I/O).      *
 ******************************************************************************/
 
-#ifndef GIF_LIB_H
-#define GIF_LIB_H
+#ifndef INCLUDED_gifrlib_h_
+#define INCLUDED_gifrlib_h_
 
 #define	GIF_ERROR	0
 #define GIF_OK		1
@@ -36,11 +36,7 @@ typedef	unsigned char	GifPixelType;
 typedef unsigned char *	GifRowType;
 typedef unsigned char	GifByteType;
 
-#ifdef SYSV
-#define VoidPtr char *
-#else
 #define VoidPtr void *
-#endif /* SYSV */
 
 typedef struct GifColorType {
     GifByteType Red, Green, Blue;
@@ -168,14 +164,14 @@ extern void GifWarning(GifFileType *GifFile, const char *err_str);
 /* This is the in-core version of an extension record */
 typedef struct {
     int		ByteCount;
-    char	*Bytes;		/* on malloc(3) heap */
+    GifByteType	*Bytes;		/* on malloc(3) heap */
 } ExtensionBlock;
 
 /* This holds an image header, its unpacked raster bits, and extensions */
 typedef struct SavedImage {
     GifImageDesc	ImageDesc;
 
-    char		*RasterBits;		/* on malloc(3) heap */
+    GifPixelType	*RasterBits;		/* on malloc(3) heap */
 
     int			Function;
     int			ExtensionBlockCount;
@@ -268,5 +264,4 @@ int GifStdFileClose(VoidPtr method_data);
 ColorMapObject *MakeMapObject(int ColorCount, GifColorType *ColorMap);
 void FreeMapObject(ColorMapObject *Object);
 
-
-#endif /* GIF_LIB_H */
+#endif /* INCLUDED_gifrlib_h_ */