From 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 10 Apr 2012 14:58:33 +0200 Subject: Updated following packages: bigreqsproto-1.1.2 fontsproto-2.1.2 recordproto-1.14.2 scrnsaverproto-1.2.2 xcmiscproto-1.2.2 libXt-1.1.3 xhost-1.0.5 kbproto-1.0.6 libXrender-0.9.7 libxkbfile-1.0.8 freetype-2.4.9 libXaw-1.0.10 libXpm-3.5.10 xproto-7.0.23 --- libXpm/src/XpmI.h | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'libXpm/src/XpmI.h') diff --git a/libXpm/src/XpmI.h b/libXpm/src/XpmI.h index 9d4b1aeee..122aea508 100644 --- a/libXpm/src/XpmI.h +++ b/libXpm/src/XpmI.h @@ -98,7 +98,7 @@ extern FILE *popen(); #ifndef SIZE_MAX # ifdef ULONG_MAX # define SIZE_MAX ULONG_MAX -# else +# else # define SIZE_MAX UINT_MAX # endif #endif @@ -114,7 +114,8 @@ typedef struct { unsigned int line; int CommentLength; char Comment[XPMMAXCMTLEN]; - char *Bcmt, *Ecmt, Bos, Eos; + const char *Bcmt, *Ecmt; + char Bos, Eos; int format; /* 1 if XPM1, 0 otherwise */ #ifdef CXPMPROG int lineNum; @@ -132,15 +133,15 @@ typedef struct { #define SPC ' ' typedef struct { - char *type; /* key word */ - char *Bcmt; /* string beginning comments */ - char *Ecmt; /* string ending comments */ + const char *type; /* key word */ + const char *Bcmt; /* string beginning comments */ + const char *Ecmt; /* string ending comments */ char Bos; /* character beginning strings */ char Eos; /* character ending strings */ - char *Strs; /* strings separator */ - char *Dec; /* data declaration string */ - char *Boa; /* string beginning assignment */ - char *Eoa; /* string ending assignment */ + const char *Strs; /* strings separator */ + const char *Dec; /* data declaration string */ + const char *Boa; /* string beginning assignment */ + const char *Eoa; /* string ending assignment */ } xpmDataType; extern xpmDataType xpmDataTypes[]; @@ -157,7 +158,7 @@ typedef struct { /* Maximum number of rgb mnemonics allowed in rgb text file. */ #define MAX_RGBNAMES 1024 -extern char *xpmColorKeys[]; +extern const char *xpmColorKeys[]; #define TRANSPARENT_COLOR "None" /* this must be a string! */ @@ -306,24 +307,20 @@ FUNC(xpm_znormalizeimagebits, void, (register unsigned char *bp, #define ZINDEX1(x, y, img) ((y) * img->bytes_per_line) + ((x) >> 3) #endif /* not AMIGA */ -#ifdef __STDC__ -#define Const const -#else -#define Const /**/ -#endif - #ifdef NEED_STRDUP FUNC(xpmstrdup, char *, (char *s1)); #else #undef xpmstrdup #define xpmstrdup strdup +#include #endif -#ifdef NEED_STRCASECMP +#ifdef NEED_STRCASECMP FUNC(xpmstrcasecmp, int, (char *s1, char *s2)); #else #undef xpmstrcasecmp #define xpmstrcasecmp strcasecmp +#include #endif FUNC(xpmatoui, unsigned int, -- cgit v1.2.3