xserver: Branch 'master'

[Alan Coopersmith]

 include/dix.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3b687ffe1649449b3d182f5e7690274c6c96916a
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Jul 17 18:16:59 2008 -0700

    Make xstrcasestr prototype return value match the implementation

diff --git a/include/dix.h b/include/dix.h
index ac03ce0..fcb2488 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -611,7 +611,7 @@ extern int xstrncasecmp(const char *s1, const char *s2, size_t n);
 
 #if NEED_STRCASESTR
 #define strcasestr xstrcasestr
-extern int xstrcasestr(const char *s, const char *find);
+extern char *xstrcasestr(const char *s, const char *find);
 #endif
 
 extern int XItoCoreType(int xi_type);