diff --git a/moo/Makefile.in b/moo/Makefile.in index 33f9644..6e0a6e9 100644 --- a/moo/Makefile.in +++ b/moo/Makefile.in @@ -349,7 +349,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/moo/bin/Makefile.in b/moo/bin/Makefile.in index c14f3f5..e206733 100644 --- a/moo/bin/Makefile.in +++ b/moo/bin/Makefile.in @@ -333,7 +333,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/moo/configure b/moo/configure index b072f73..10f1b5b 100755 --- a/moo/configure +++ b/moo/configure @@ -783,7 +783,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -820,7 +819,7 @@ enable_libtool_lock enable_largefile enable_experimental enable_debug -enable_unicode +enable_wide_char enable_full_liw enable_fltmax enable_dynamic_module @@ -881,7 +880,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1134,15 +1132,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1280,7 +1269,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1433,7 +1422,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1486,9 +1474,9 @@ Optional Features: --disable-largefile omit support for large files --enable-experimental enable experimental feature(default. no) --enable-debug compile the code in the debug mode (default. no) - --enable-unicode Use the unicode character type as the default - character type. one of yes, no, yes:2, yes:4, no:2, - no:4 (default. yes) + --enable-wide-char Use the wide-character type as the default character + type. one of yes, no, yes:2, yes:4, no:2, no:4 + (default. yes) --enable-full-liw Use a full word as a large integer word (default. no) --enable-awk-fltmax use hawk_fltmax_t for floating-point numbers @@ -13273,7 +13261,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -13319,7 +13307,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -13343,7 +13331,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -13388,7 +13376,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -13412,7 +13400,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17898,63 +17886,63 @@ $as_echo "#define MOO_BUILD_RELEASE 1" >>confdefs.h fi -# Check whether --enable-unicode was given. -if test "${enable_unicode+set}" = set; then : - enableval=$enable_unicode; enable_unicode=$enableval +# Check whether --enable-wide-char was given. +if test "${enable_wide_char+set}" = set; then : + enableval=$enable_wide_char; enable_wide_char=$enableval else - enable_unicode=yes + enable_wide_char=yes fi -if test "${enable_unicode}" = "yes:4" +if test "${enable_wide_char}" = "yes:4" then -$as_echo "#define MOO_UNICODE_SIZE 4" >>confdefs.h +$as_echo "#define MOO_WIDE_CHAR_SIZE 4" >>confdefs.h -$as_echo "#define MOO_ENABLE_UNICODE 1" >>confdefs.h +$as_echo "#define MOO_ENABLE_WIDE_CHAR 1" >>confdefs.h if test "${platform_win32}" = "yes" then CFLAGS="$CFLAGS -DUNICODE -D_UNICODE" fi -elif test "${enable_unicode}" = "yes:2" +elif test "${enable_wide_char}" = "yes:2" then -$as_echo "#define MOO_UNICODE_SIZE 2" >>confdefs.h +$as_echo "#define MOO_WIDE_CHAR_SIZE 2" >>confdefs.h -$as_echo "#define MOO_ENABLE_UNICODE 1" >>confdefs.h +$as_echo "#define MOO_ENABLE_WIDE_CHAR 1" >>confdefs.h if test "${platform_win32}" = "yes" then CFLAGS="$CFLAGS -DUNICODE -D_UNICODE" fi -elif test "${enable_unicode}" = "yes" +elif test "${enable_wide_char}" = "yes" then -$as_echo "#define MOO_UNICODE_SIZE 1" >>confdefs.h +$as_echo "#define MOO_WIDE_CHAR_SIZE 1" >>confdefs.h -$as_echo "#define MOO_ENABLE_UNICODE 1" >>confdefs.h +$as_echo "#define MOO_ENABLE_WIDE_CHAR 1" >>confdefs.h if test "${platform_win32}" = "yes" then CFLAGS="$CFLAGS -DUNICODE -D_UNICODE" fi -elif test "${enable_unicode}" = "no:4" +elif test "${enable_wide_char}" = "no:4" then -$as_echo "#define MOO_UNICODE_SIZE 4" >>confdefs.h +$as_echo "#define MOO_WIDE_CHAR_SIZE 4" >>confdefs.h -elif test "${enable_unicode}" = "no:2" +elif test "${enable_wide_char}" = "no:2" then -$as_echo "#define MOO_UNICODE_SIZE 2" >>confdefs.h +$as_echo "#define MOO_WIDE_CHAR_SIZE 2" >>confdefs.h else -$as_echo "#define MOO_UNICODE_SIZE 1" >>confdefs.h +$as_echo "#define MOO_WIDE_CHAR_SIZE 1" >>confdefs.h fi diff --git a/moo/configure.ac b/moo/configure.ac index 85f9c86..5191def 100644 --- a/moo/configure.ac +++ b/moo/configure.ac @@ -660,44 +660,44 @@ else AC_SUBST(BUILD_MODE, "release") fi -dnl ===== enable-unicode ===== -AC_ARG_ENABLE([unicode], - [AS_HELP_STRING([--enable-unicode],[Use the unicode character type as the default character type. one of yes, no, yes:2, yes:4, no:2, no:4 (default. yes)])], - enable_unicode=$enableval, - enable_unicode=yes +dnl ===== enable-wide-char ===== +AC_ARG_ENABLE([wide-char], + [AS_HELP_STRING([--enable-wide-char],[Use the wide-character type as the default character type. one of yes, no, yes:2, yes:4, no:2, no:4 (default. yes)])], + enable_wide_char=$enableval, + enable_wide_char=yes ) -if test "${enable_unicode}" = "yes:4" +if test "${enable_wide_char}" = "yes:4" then - AC_DEFINE([MOO_UNICODE_SIZE],[4],[Unicode character type size]) - AC_DEFINE([MOO_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type]) + AC_DEFINE([MOO_WIDE_CHAR_SIZE],[4],[Wide-character type size]) + AC_DEFINE([MOO_ENABLE_WIDE_CHAR],[1],[Use the wide-character type as the default character type]) if test "${platform_win32}" = "yes" then [CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"] fi -elif test "${enable_unicode}" = "yes:2" +elif test "${enable_wide_char}" = "yes:2" then - AC_DEFINE([MOO_UNICODE_SIZE],[2],[Unicode character type size]) - AC_DEFINE([MOO_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type]) + AC_DEFINE([MOO_WIDE_CHAR_SIZE],[2],[Wide-character type size]) + AC_DEFINE([MOO_ENABLE_WIDE_CHAR],[1],[Use the wide-character type as the default character type]) if test "${platform_win32}" = "yes" then [CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"] fi -elif test "${enable_unicode}" = "yes" +elif test "${enable_wide_char}" = "yes" then - AC_DEFINE([MOO_UNICODE_SIZE],[1],[Unicode character type size]) - AC_DEFINE([MOO_ENABLE_UNICODE],[1],[Use the unicode character type as the default character type]) + AC_DEFINE([MOO_WIDE_CHAR_SIZE],[1],[Wide-character type size]) + AC_DEFINE([MOO_ENABLE_WIDE_CHAR],[1],[Use the wide-character type as the default character type]) if test "${platform_win32}" = "yes" then [CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"] fi -elif test "${enable_unicode}" = "no:4" +elif test "${enable_wide_char}" = "no:4" then - AC_DEFINE([MOO_UNICODE_SIZE],[4],[Unicode character type size]) -elif test "${enable_unicode}" = "no:2" + AC_DEFINE([MOO_WIDE_CHAR_SIZE],[4],[Wide-character type size]) +elif test "${enable_wide_char}" = "no:2" then - AC_DEFINE([MOO_UNICODE_SIZE],[2],[Unicode character type size]) + AC_DEFINE([MOO_WIDE_CHAR_SIZE],[2],[Wide-character type size]) else - AC_DEFINE([MOO_UNICODE_SIZE],[1],[Unicode character type size]) + AC_DEFINE([MOO_WIDE_CHAR_SIZE],[1],[Wide-character type size]) fi dnl ===== enable-full-liw ===== diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index 0aec3e2..9b645d8 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -413,7 +413,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/moo/lib/moo-cfg.h.in b/moo/lib/moo-cfg.h.in index 2db381b..7b9c0a3 100644 --- a/moo/lib/moo-cfg.h.in +++ b/moo/lib/moo-cfg.h.in @@ -366,8 +366,8 @@ /* link modules statically into the main library */ #undef MOO_ENABLE_STATIC_MODULE -/* Use the unicode character type as the default character type */ -#undef MOO_ENABLE_UNICODE +/* Use the wide-character type as the default character type */ +#undef MOO_ENABLE_WIDE_CHAR /* Big Endian */ #undef MOO_ENDIAN_BIG @@ -501,12 +501,12 @@ /* Define if socklen_t is signed */ #undef MOO_SOCKLEN_T_IS_SIGNED -/* Unicode character type size */ -#undef MOO_UNICODE_SIZE - /* use hawk_fltmax_t for floating-point numbers */ #undef MOO_USE_FLTMAX +/* Wide-character type size */ +#undef MOO_WIDE_CHAR_SIZE + /* The size of `MB_LEN_MAX', as computed by valueof. */ #undef NUMVALOF_MB_LEN_MAX diff --git a/moo/lib/moo-cmn.h b/moo/lib/moo-cmn.h index 4ae5d07..dda7a4a 100644 --- a/moo/lib/moo-cmn.h +++ b/moo/lib/moo-cmn.h @@ -399,7 +399,7 @@ typedef unsigned char moo_bchu_t; /* unsigned version of moo_bch_t for #define MOO_SIZEOF_BCH_T MOO_SIZEOF_CHAR #define MOO_SIZEOF_BCI_T MOO_SIZEOF_INT -#if defined(MOO_UNICODE_SIZE) && (MOO_UNICODE_SIZE >= 4) +#if defined(MOO_WIDE_CHAR_SIZE) && (MOO_WIDE_CHAR_SIZE >= 4) # if defined(__GNUC__) && defined(__CHAR32_TYPE__) typedef __CHAR32_TYPE__ moo_uch_t; # else @@ -453,7 +453,7 @@ struct moo_bcs_t }; typedef struct moo_bcs_t moo_bcs_t; -#if defined(MOO_ENABLE_UNICODE) +#if defined(MOO_ENABLE_WIDE_CHAR) typedef moo_uch_t moo_ooch_t; typedef moo_uchu_t moo_oochu_t; typedef moo_uci_t moo_ooci_t; diff --git a/moo/lib/moo-msw.h b/moo/lib/moo-msw.h index c17ef8a..de6f94a 100644 --- a/moo/lib/moo-msw.h +++ b/moo/lib/moo-msw.h @@ -43,7 +43,7 @@ _M_X64 x64 platform #define MOO_ENABLE_DYNAMIC_MODULE /* use UCS4 for uch_t */ -/*#define MOO_UNICODE_SIZE 4*/ +/*#define MOO_WIDE_CHAR_SIZE 4*/ /* windows for most of non-x86 platforms dropped. * make it selective to support old non-x86 windows platforms. */ diff --git a/moo/mod/Makefile.in b/moo/mod/Makefile.in index 24e308b..255f25a 100644 --- a/moo/mod/Makefile.in +++ b/moo/mod/Makefile.in @@ -431,7 +431,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/moo/t/Makefile.in b/moo/t/Makefile.in index 59a8e11..213ebd6 100644 --- a/moo/t/Makefile.in +++ b/moo/t/Makefile.in @@ -109,15 +109,14 @@ PROGRAMS = $(bin_PROGRAMS) am_t_001_OBJECTS = t-001.$(OBJEXT) t_001_OBJECTS = $(am_t_001_OBJECTS) t_001_LDADD = $(LDADD) -am__DEPENDENCIES_1 = -t_001_DEPENDENCIES = $(am__DEPENDENCIES_1) +t_001_DEPENDENCIES = AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = am_t_002_OBJECTS = t-002.$(OBJEXT) t_002_OBJECTS = $(am_t_002_OBJECTS) -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_1 = am_t_003_OBJECTS = t-003.$(OBJEXT) t_003_OBJECTS = $(am_t_003_OBJECTS) am_t_004_OBJECTS = t-004.$(OBJEXT) @@ -328,7 +327,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -338,7 +336,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = nostdinc -AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ -I$(abs_builddir) \ -I$(abs_builddir)/../lib \ @@ -347,7 +344,7 @@ AM_CPPFLAGS = \ -I$(includedir) AM_LDFLAGS = -L$(abs_builddir)/../lib -L$(libdir) -LDADD = $(PTHREAD_LIBS) +LDADD = t_001_SOURCES = t-001.c t_002_SOURCES = t-002.c t_002_LDADD = -lmoo $(LDADD) diff --git a/moo/tools/Makefile.in b/moo/tools/Makefile.in index c491cc4..41e655e 100644 --- a/moo/tools/Makefile.in +++ b/moo/tools/Makefile.in @@ -325,7 +325,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/moo/wasm/Makefile.in b/moo/wasm/Makefile.in index ea206f1..cdbd405 100644 --- a/moo/wasm/Makefile.in +++ b/moo/wasm/Makefile.in @@ -263,7 +263,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@