aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/utils.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-14 09:38:56 +0100
committermarha <marha@users.sourceforge.net>2011-11-14 09:38:56 +0100
commit156e37d3879b316329e3e05579414031da2647e2 (patch)
tree59fb1dce046fd3aab228e224bff8b0c1d074f876 /xkbcomp/utils.h
parentd783adea42f29bd7917929597ca1031b70587e1d (diff)
downloadvcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.gz
vcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.bz2
vcxsrv-156e37d3879b316329e3e05579414031da2647e2.zip
libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update
14 nov 2011
Diffstat (limited to 'xkbcomp/utils.h')
-rw-r--r--xkbcomp/utils.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/xkbcomp/utils.h b/xkbcomp/utils.h
index 61a598734..63eda3632 100644
--- a/xkbcomp/utils.h
+++ b/xkbcomp/utils.h
@@ -159,7 +159,7 @@ uInformation(const char * /* s */ , ...
#define FATAL uFatalError
extern void uFatalError(const char * /* s */ , ...
- ) _X_ATTRIBUTE_PRINTF(1, 2);
+ ) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
/* WSGO stands for "Weird Stuff Going On" */
#define WSGO6 uInternalError
@@ -196,6 +196,7 @@ uInformation(const char * /* s */ , ...
(s1)!=(s2):strcmp(s1,s2))
#define uStrCaseEqual(s1,s2) (uStrCaseCmp(s1,s2)==0)
#ifdef HAVE_STRCASECMP
+#include <strings.h>
#define uStrCaseCmp(s1,s2) (strcasecmp(s1,s2))
#define uStrCasePrefix(p,s) (strncasecmp(p,s,strlen(p))==0)
#else
@@ -207,6 +208,7 @@ uInformation(const char * /* s */ , ...
);
#endif
#ifdef HAVE_STRDUP
+#include <string.h>
#define uStringDup(s1) ((s1) ? strdup(s1) : NULL)
#else
extern char *uStringDup(const char * /* s1 */