Date: Monday, January 29, 2007 @ 18:19:20
Author: marc
Path: /cvsroot/carob/carob
Modified: make-includes/freebsd-os.mk (1.4 -> 1.5) src/StringCodecs.cpp
(1.22 -> 1.23)
Moved CAROB_FORCE_UNICODE_WCHAR from src/StringCodecs.cpp to
make-includes/freebsd-os.mk
-----------------------------+
make-includes/freebsd-os.mk | 14 +++++++++++---
src/StringCodecs.cpp | 15 +--------------
2 files changed, 12 insertions(+), 17 deletions(-)
Index: carob/make-includes/freebsd-os.mk
diff -u carob/make-includes/freebsd-os.mk:1.4
carob/make-includes/freebsd-os.mk:1.5
--- carob/make-includes/freebsd-os.mk:1.4 Fri Jan 19 19:21:56 2007
+++ carob/make-includes/freebsd-os.mk Mon Jan 29 18:19:20 2007
@@ -16,12 +16,20 @@
MK_LDFLAGS += -L/usr/local/lib
-# std::locale("en_US.UTF-8") does not seen to work on FreeBSD 6.2 PRERELEASE?
+# named locales do not work on FreeBSD. See carob/doc/locales
# fallback on Iconv
MK_CPPFLAGS += -DCAROB_USE_ICONV
MK_LDLIBS += -liconv
-# actually iconv does not work either: unable to encode to UTF8
-# anything else than ASCII...
+
+# Unreliable FreeBSD hack. According to Bruno Haible, in 2000
+# wchar_t on FreeBSD was: "All bytes belonging to the multibyte char,
+# packed in a single word. This makes the widechar <--> multibyte
+# converter quite fast."
+#
+# ==> locale-dependent and definitely not unicode.
+# See also carob/doc/locales
+
+MK_CPPFLAGS += -DCAROB_FORCE_UNICODE_WCHAR
Index: carob/src/StringCodecs.cpp
diff -u carob/src/StringCodecs.cpp:1.22 carob/src/StringCodecs.cpp:1.23
--- carob/src/StringCodecs.cpp:1.22 Wed Jan 24 11:43:11 2007
+++ carob/src/StringCodecs.cpp Mon Jan 29 18:19:20 2007
@@ -73,7 +73,7 @@
/**
* Catching std::runtime_error from std::codecvt_byname() segfaults
- * with gcc 4.0.2, see
+ * with gcc 4.0.2-5, see
* <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=343108>
* So unfortunately do NOT do this. This code is a reminder.
*/
@@ -176,19 +176,6 @@
#define TOSTRING(x) STRINGIFY(x)
-
-/**
- * Unreliable FreeBSD hack. According to Bruno Haible, in 2000
- * wchar_t on FreeBSD was: "All bytes belonging to the multibyte char,
- * packed in a single word. This makes the widechar <--> multibyte
- * converter quite fast."
- *
- * ==> locale-dependent and definitely not unicode.
- */
-#ifdef __FreeBSD__ // TODO: __FreeBSD__ > ?
-#define CAROB_FORCE_UNICODE_WCHAR
-#endif
-
namespace {
/**
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
