xserver: Branch 'master'

[Matthieu Herrb]

 hw/xfree86/common/xf86Xinput.c  |    2 ++
 hw/xfree86/dixmods/xkbPrivate.c |    1 +
 include/dix.h                   |   16 ----------------
 include/os.h                    |   16 ++++++++++++++++
 xkb/maprules.c                  |    1 +
 5 files changed, 20 insertions(+), 16 deletions(-)

New commits:
commit 2e2ce817ce404a5e000c9750fa96f656fed370b8
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Aug 10 23:07:46 2008 +0200

    Move strcasecmp(), strcasencmp() and strcasestr() prototypes to os.h
    
    And make sure os.h is included in files that use it.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index a8c9166..530fa86 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 7de3a66..40c9311 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 64e3d78..476ec2e 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 ac418ce..bfe2363 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 4c947f0..b25d929 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>