From 55d95c1cd040a1ab0d28287ccba09b93e3ffaa93 Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Sat, 15 Mar 2014 01:48:51 +0100
Subject: [PATCH] remove HAVE_{ISWUPPER,ISWLOWER,TOWUPPER,TOWLOWER}

---
 config/config.h.in |  3 ---
 src/charset.c      | 13 +------------
 src/mbyte.c        |  4 ++--
 src/spell.c        | 33 +++++++++------------------------
 4 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/config/config.h.in b/config/config.h.in
index 79d3b31716..596dfe1b0a 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -35,7 +35,6 @@
 #define HAVE_GETWD 1
 #define HAVE_ICONV 1
 #define HAVE_ICONV_H 1
-#define HAVE_ISWUPPER 1
 #define HAVE_LANGINFO_H 1
 #define HAVE_LIBGEN_H 1
 #define HAVE_LIBINTL_H 1
@@ -98,8 +97,6 @@
 #define HAVE_TERMIO_H 1
 #define HAVE_TERMIOS_H 1
 #define HAVE_TGETENT 1
-#define HAVE_TOWLOWER 1
-#define HAVE_TOWUPPER 1
 #define HAVE_UNISTD_H 1
 #define HAVE_UP_BC_PC 1
 #define HAVE_USLEEP 1
diff --git a/src/charset.c b/src/charset.c
index 0aabacd0b6..94ed2c6f4f 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -3,6 +3,7 @@
 /// Code related to character sets.
 
 #include <string.h>
+#include <wctype.h>
 
 #include "vim.h"
 #include "charset.h"
@@ -1552,12 +1553,9 @@ int vim_islower(int c)
     }
 
     if (c >= 0x100) {
-#ifdef HAVE_ISWLOWER
-
       if (has_mbyte) {
         return iswlower(c);
       }
-#endif  // ifdef HAVE_ISWLOWER
 
       // islower() can't handle these chars and may crash
       return FALSE;
@@ -1582,12 +1580,9 @@ int vim_isupper(int c)
     }
 
     if (c >= 0x100) {
-#ifdef HAVE_ISWUPPER
-
       if (has_mbyte) {
         return iswupper(c);
       }
-#endif  // ifdef HAVE_ISWUPPER
 
       // islower() can't handle these chars and may crash
       return FALSE;
@@ -1612,12 +1607,9 @@ int vim_toupper(int c)
     }
 
     if (c >= 0x100) {
-#ifdef HAVE_TOWUPPER
-
       if (has_mbyte) {
         return towupper(c);
       }
-#endif  // ifdef HAVE_TOWUPPER
 
       // toupper() can't handle these chars and may crash
       return c;
@@ -1642,12 +1634,9 @@ int vim_tolower(int c)
     }
 
     if (c >= 0x100) {
-#ifdef HAVE_TOWLOWER
-
       if (has_mbyte) {
         return towlower(c);
       }
-#endif  // ifdef HAVE_TOWLOWER
 
       // tolower() can't handle these chars and may crash
       return c;
diff --git a/src/mbyte.c b/src/mbyte.c
index 8ac60ede11..112dad1bc3 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2736,7 +2736,7 @@ int utf_toupper(int a)
   if (a < 128 && (cmp_flags & CMP_KEEPASCII))
     return TOUPPER_ASC(a);
 
-#if defined(HAVE_TOWUPPER) && defined(__STDC_ISO_10646__)
+#if defined(__STDC_ISO_10646__)
   /* If towupper() is available and handles Unicode, use it. */
   if (!(cmp_flags & CMP_INTERNAL))
     return towupper(a);
@@ -2766,7 +2766,7 @@ int utf_tolower(int a)
   if (a < 128 && (cmp_flags & CMP_KEEPASCII))
     return TOLOWER_ASC(a);
 
-#if defined(HAVE_TOWLOWER) && defined(__STDC_ISO_10646__)
+#if defined(__STDC_ISO_10646__)
   /* If towlower() is available and handles Unicode, use it. */
   if (!(cmp_flags & CMP_INTERNAL))
     return towlower(a);
diff --git a/src/spell.c b/src/spell.c
index 6df0e340a1..a50d872fa1 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -969,32 +969,17 @@ static void close_spellbuf(buf_T *buf);
 # endif
 /* Multi-byte implementation.  For Unicode we can call utf_*(), but don't do
  * that for ASCII, because we don't want to use 'casemap' here.  Otherwise use
- * the "w" library function for characters above 255 if available. */
-# ifdef HAVE_TOWLOWER
-#  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
-                           : (c) < \
-                           256 ? (int)spelltab.st_fold[c] : (int)towlower(c))
-# else
-#  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
-                           : (c) < 256 ? (int)spelltab.st_fold[c] : (c))
-# endif
+ * the "w" library function for characters above 255. */
+#define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
+                         : (c) < \
+                         256 ? (int)spelltab.st_fold[c] : (int)towlower(c))
 
-# ifdef HAVE_TOWUPPER
-#  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
-                            : (c) < \
-                            256 ? (int)spelltab.st_upper[c] : (int)towupper(c))
-# else
-#  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
-                            : (c) < 256 ? (int)spelltab.st_upper[c] : (c))
-# endif
+#define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
+                          : (c) < \
+                          256 ? (int)spelltab.st_upper[c] : (int)towupper(c))
 
-# ifdef HAVE_ISWUPPER
-#  define SPELL_ISUPPER(c) (enc_utf8 && (c) >= 128 ? utf_isupper(c) \
-                            : (c) < 256 ? spelltab.st_isu[c] : iswupper(c))
-# else
-#  define SPELL_ISUPPER(c) (enc_utf8 && (c) >= 128 ? utf_isupper(c) \
-                            : (c) < 256 ? spelltab.st_isu[c] : (FALSE))
-# endif
+#define SPELL_ISUPPER(c) (enc_utf8 && (c) >= 128 ? utf_isupper(c) \
+                          : (c) < 256 ? spelltab.st_isu[c] : iswupper(c))
 
 
 static char *e_format = N_("E759: Format error in spell file");