summaryrefslogtreecommitdiff
path: root/lib/mbspcasecmp.c
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2008-12-22 12:11:44 +0100
committerBruno Haible <bruno@clisp.org>2008-12-22 12:11:44 +0100
commit4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4 (patch)
tree73f83433f8d40c84f098fb4e179b97f1dbcc2cba /lib/mbspcasecmp.c
parent3e2e5dc1f6ded97ce60498e3ceb67fca5a41b8a8 (diff)
downloadgnulib-4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4.tar.gz
Remove HAVE_MBRTOWC conditionals. Use mbrtowc unconditionally.
Diffstat (limited to 'lib/mbspcasecmp.c')
-rw-r--r--lib/mbspcasecmp.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/mbspcasecmp.c b/lib/mbspcasecmp.c
index 7340cafb6b..7cde9b76e7 100644
--- a/lib/mbspcasecmp.c
+++ b/lib/mbspcasecmp.c
@@ -1,5 +1,5 @@
/* Case-insensitive string comparison function.
- Copyright (C) 1998-1999, 2005-2007 Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-2008 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2007.
This program is free software: you can redistribute it and/or modify
@@ -22,9 +22,7 @@
#include <ctype.h>
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
@@ -47,7 +45,6 @@ mbspcasecmp (const char *string, const char *prefix)
/* Be careful not to look at the entire extent of STRING or PREFIX until
needed. This is useful because when two strings differ, the difference is
most often already in the very few first characters. */
-#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
mbui_iterator_t iter1;
@@ -74,7 +71,6 @@ mbspcasecmp (const char *string, const char *prefix)
return NULL;
}
else
-#endif
{
const unsigned char *p1 = (const unsigned char *) string;
const unsigned char *p2 = (const unsigned char *) prefix;