In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c7925a5e8559739ce765137cf6164c5872c63a96?hp=cbfcbc146698ed220945a7de6d4cd404a5338175>
- Log ----------------------------------------------------------------- commit c7925a5e8559739ce765137cf6164c5872c63a96 Author: Daniel Dragan <[email protected]> Date: Thu Oct 9 19:43:13 2014 -0400 fix WinCE build locale changes in 2014 broke WinCE build. localconv() doesn't exist on WinCE. locale.h from celib has to be included for setlocale()/xcesetlocale() and LC_* constants. ----------------------------------------------------------------------- Summary of changes: perl.h | 9 +++++++++ win32/config.ce | 4 ++-- win32/config_H.ce | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/perl.h b/perl.h index 3235476..0bd8a53 100644 --- a/perl.h +++ b/perl.h @@ -704,6 +704,15 @@ # endif #endif +/* EVC 4 SDK headers includes a bad definition of MB_CUR_MAX in stdlib.h + which is included from stdarg.h. Bad definition not present in SD 2008 + SDK headers. wince.h is not yet included, so we cant fix this from there + since by then MB_CUR_MAX will be defined from stdlib.h. + cewchar.h includes a correct definition of MB_CUR_MAX and it is copied here + since cewchar.h can't be included this early */ +#if defined(UNDER_CE) && (_MSC_VER < 1300) +# define MB_CUR_MAX 1 +#endif #ifdef I_STDARG # include <stdarg.h> #else diff --git a/win32/config.ce b/win32/config.ce index 37be642..d63df39 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -303,7 +303,7 @@ d_link='define' d_localtime64='undef' d_localtime_r='undef' d_localtime_r_needs_tzset='undef' -d_locconv='define' +d_locconv='undef' d_lockf='undef' d_longdbl='undef' d_longlong='undef' @@ -656,7 +656,7 @@ i_inttypes='undef' i_langinfo='undef' i_libutil='undef' i_limits='define' -i_locale='undef' +i_locale='define' i_machcthr='undef' i_malloc='define' i_mallocmalloc='undef' diff --git a/win32/config_H.ce b/win32/config_H.ce index e2837a6..196f419 100644 --- a/win32/config_H.ce +++ b/win32/config_H.ce @@ -227,7 +227,7 @@ * This symbol, if defined, indicates that the localeconv routine is * available for numeric and monetary formatting conventions. */ -#define HAS_LOCALECONV /**/ +/*#define HAS_LOCALECONV /**/ /* HAS_LOCKF: * This symbol, if defined, indicates that the lockf routine is -- Perl5 Master Repository
