It seems that __STDC_ISO_10646__ isn't defined even where it can be

defined, so remove the check for it and leave it up to people compiling
the software (DOWNSTREAM) to take care of this.  This will eventually
need to be fixed up with a proper non-10646 converter and so on, but
this is a simple start.  While here, strengthen then language in the
Makefile to this effect.

diff --git a/Makefile b/Makefile
index a0d7d14cbf8391a27d0a03452ac0054d4b710d95..efc8987539b6e91be1d358a42bf2326eeedf97a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,11 @@
 
 VERSION                 = 1.11.2
 VDATE           = 12 May 2011
 
 VERSION                 = 1.11.2
 VDATE           = 12 May 2011

-# If your system doesn't support multi-byte functions (specifically
-# setlocale(), wcwidth(), putwchar()), then remove -DUSE_WCHAR.  You'll
-# still be able to use -Tlocale, but it becomes a synonym for -Tascii.
+# IFF your system supports multi-byte functions (setlocale(), wcwidth(),
+# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
+# UCS-4 value) should you define USE_WCHAR.  If you define it and your
+# system DOESN'T support this, -Tlocale will produce garbage.
+# If you don't define it, -Tlocale is a synonym for -Tacsii.

 CFLAGS         += -g -DUSE_WCHAR -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
 CFLAGS         += -g -DUSE_WCHAR -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local

diff --git a/term_ascii.c b/term_ascii.c
index 7619907ed14479d348d35cbbdebe4d6a9d9d48e0..3b4ca241196dc1582f038cd8f2cc662775e89a28 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.15 2011/05/17 22:32:45 kristaps Exp $ */
+/*     $Id: term_ascii.c,v 1.16 2011/05/19 15:48:58 kristaps Exp $ */

 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -37,9 +37,16 @@
 #include "term.h"
 #include "main.h"
 
 #include "term.h"
 #include "main.h"
 

+/* 
+ * Sadly, this doesn't seem to be defined on systems even when they
+ * support it.  For the time being, remove it and let those compiling
+ * the software decide for themselves what to use.
+ */
+#if 0

 #if ! defined(__STDC_ISO_10646__)
 # undef USE_WCHAR
 #endif
 #if ! defined(__STDC_ISO_10646__)
 # undef USE_WCHAR
 #endif

+#endif

 
 static struct termp     *ascii_init(enum termenc, char *);
 static double            ascii_hspan(const struct termp *,
 
 static struct termp     *ascii_init(enum termenc, char *);
 static double            ascii_hspan(const struct termp *,