diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2008-08-10 23:07:46 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@bluenote.herrb.net> | 2008-08-10 23:07:46 +0200 |
| commit | 2e2ce817ce404a5e000c9750fa96f656fed370b8 (patch) | |
| tree | 07da13f2a6ba0dd799a80b27f3d5c90ff4243a2f | |
| parent | 02efa78ce2da470b252289ff2af598d06bc84ece (diff) | |
| download | xserver-2e2ce817ce404a5e000c9750fa96f656fed370b8.tar.gz | |
Move strcasecmp(), strcasencmp() and strcasestr() prototypes to os.h
And make sure os.h is included in files that use it.
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/xkbPrivate.c | 1 | ||||
| -rw-r--r-- | include/dix.h | 16 | ||||
| -rw-r--r-- | include/os.h | 16 | ||||
| -rw-r--r-- | xkb/maprules.c | 1 |
5 files changed, 20 insertions, 16 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index a8c9166e3..530fa86e0 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -88,6 +88,8 @@ #include "dgaproc.h" #endif +#include "os.h" + EventListPtr xf86Events = NULL; /** diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c index 7de3a66c6..40c931156 100644 --- a/hw/xfree86/dixmods/xkbPrivate.c +++ b/hw/xfree86/dixmods/xkbPrivate.c @@ -14,6 +14,7 @@ #define XKBSRV_NEED_FILE_FUNCS #include <xkbsrv.h> +#include "os.h" #include "xf86.h" int diff --git a/include/dix.h b/include/dix.h index 64e3d7874..476ec2ecb 100644 --- a/include/dix.h +++ b/include/dix.h @@ -596,22 +596,6 @@ typedef struct { int count; } DeviceEventInfoRec; -/* strcasecmp.c */ -#if NEED_STRCASECMP -#define strcasecmp xstrcasecmp -extern int xstrcasecmp(const char *s1, const char *s2); -#endif - -#if NEED_STRNCASECMP -#define strncasecmp xstrncasecmp -extern int xstrncasecmp(const char *s1, const char *s2, size_t n); -#endif - -#if NEED_STRCASESTR -#define strcasestr xstrcasestr -extern char *xstrcasestr(const char *s, const char *find); -#endif - extern int XItoCoreType(int xi_type); extern Bool DevHasCursor(DeviceIntPtr pDev); extern Bool IsPointerDevice( DeviceIntPtr dev); diff --git a/include/os.h b/include/os.h index ac418ce44..bfe236359 100644 --- a/include/os.h +++ b/include/os.h @@ -450,6 +450,22 @@ extern void AbortDDX(void); extern void ddxGiveUp(void); extern int TimeSinceLastInputEvent(void); +/* strcasecmp.c */ +#if NEED_STRCASECMP +#define strcasecmp xstrcasecmp +extern int xstrcasecmp(const char *s1, const char *s2); +#endif + +#if NEED_STRNCASECMP +#define strncasecmp xstrncasecmp +extern int xstrncasecmp(const char *s1, const char *s2, size_t n); +#endif + +#if NEED_STRCASESTR +#define strcasestr xstrcasestr +extern char *xstrcasestr(const char *s, const char *find); +#endif + /* Logging. */ typedef enum _LogParameter { XLOG_FLUSH, diff --git a/xkb/maprules.c b/xkb/maprules.c index 4c947f004..b25d92901 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -46,6 +46,7 @@ #include "misc.h" #include "inputstr.h" #include "dix.h" +#include "os.h" #include "xkbstr.h" #define XKBSRV_NEED_FILE_FUNCS #include <xkbsrv.h> |