diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | dfa.c | 6 | ||||
| -rw-r--r-- | mbsupport.h | 2 |
3 files changed, 4 insertions, 5 deletions
@@ -4,6 +4,7 @@ that remove many ifdefs, moving many conditions for multibyte support into regular C code and relying GCC's dead code optimization to elimnate code that won't be needed. + * dfa.c: Further edits now that MBS_SUPPORT is always defined. 2011-09-16 Arnold D. Robbins <arnold@skeeve.com> @@ -53,8 +53,8 @@ #include "gettext.h" #define _(str) gettext (str) -#include "mbsupport.h" /* defines MBS_SUPPORT if appropriate */ -#ifdef MBS_SUPPORT +#include "mbsupport.h" /* defines MBS_SUPPORT to 1 or 0, as appropriate */ +#if MBS_SUPPORT /* We can handle multibyte strings. */ #include <wchar.h> #include <wctype.h> @@ -640,7 +640,7 @@ using_utf8 (void) static int utf8 = -1; if (utf8 == -1) { -#if defined HAVE_LANGINFO_CODESET && defined MBS_SUPPORT +#if defined HAVE_LANGINFO_CODESET && MBS_SUPPORT utf8 = (STREQ (nl_langinfo (CODESET), "UTF-8")); #else utf8 = 0; diff --git a/mbsupport.h b/mbsupport.h index 4b71019d..4c9e9bfb 100644 --- a/mbsupport.h +++ b/mbsupport.h @@ -57,8 +57,6 @@ #else # define MBS_SUPPORT 0 #endif -# undef MBS_SUPPORT -# define MBS_SUPPORT 0 #if ! MBS_SUPPORT # undef MB_CUR_MAX |