summaryrefslogtreecommitdiff
path: root/xserver/os/strcasecmp.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-06-10 13:21:33 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-06-10 13:21:33 +0000
commit171e929a08098b6c844887adc43879c7579dc15f (patch)
tree6b4d2e3bc20dbd4dc9a1f031416e66614c53dd21 /xserver/os/strcasecmp.c
parent68781b09de2c95b87ea898c4ecf3018dfb4460d2 (diff)
Update to xserver 1.12.2. tested by naddy@, krw@, mpi@.
Diffstat (limited to 'xserver/os/strcasecmp.c')
-rw-r--r--xserver/os/strcasecmp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xserver/os/strcasecmp.c b/xserver/os/strcasecmp.c
index ad6da6a10..2692f7f1e 100644
--- a/xserver/os/strcasecmp.c
+++ b/xserver/os/strcasecmp.c
@@ -34,11 +34,11 @@
#include <ctype.h>
#include "dix.h"
-#ifdef NEED_STRCASECMP
+#ifndef HAVE_STRCASECMP
int
xstrcasecmp(const char *str1, const char *str2)
{
- const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
+ const u_char *us1 = (const u_char *) str1, *us2 = (const u_char *) str2;
while (tolower(*us1) == tolower(*us2)) {
if (*us1++ == '\0')
@@ -50,12 +50,12 @@ xstrcasecmp(const char *str1, const char *str2)
}
#endif
-#ifdef NEED_STRNCASECMP
+#ifndef HAVE_STRNCASECMP
int
xstrncasecmp(const char *s1, const char *s2, size_t n)
{
if (n != 0) {
- const u_char *us1 = (const u_char *)s1, *us2 = (const u_char *)s2;
+ const u_char *us1 = (const u_char *) s1, *us2 = (const u_char *) s2;
do {
if (tolower(*us1) != tolower(*us2++))