cvs: php4 /ext/standard string.c

wez Thu Jul 5 06:49:59 2001 EDT Modified files: /php4/ext/standard string.c Log: Added loads of #ifdefs; should fix Bug #11889. Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.202 php4/ext/standard/string.c:1.203 --- php4/ext/standard/string.c:1.202 Thu Jul 5 03:12:28 2001 +++ php4/ext/standard/string.c Thu Jul 5 06:49:58 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.202 2001/07/05 07:12:28 jason Exp $ */ +/* $Id: string.c,v 1.203 2001/07/05 10:49:58 wez Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -229,6 +229,7 @@ } /* }}} */ +/* {{{ PHP_MINIT_FUNCTION(nl_langinfo) */ #if HAVE_NL_LANGINFO PHP_MINIT_FUNCTION(nl_langinfo) { @@ -278,31 +279,61 @@ REGISTER_NL_LANGINFO_CONSTANT(T_FMT); REGISTER_NL_LANGINFO_CONSTANT(T_FMT_AMPM); REGISTER_NL_LANGINFO_CONSTANT(ERA); +#ifdef ERA_YEAR REGISTER_NL_LANGINFO_CONSTANT(ERA_YEAR); +#endif REGISTER_NL_LANGINFO_CONSTANT(ERA_D_T_FMT); REGISTER_NL_LANGINFO_CONSTANT(ERA_D_FMT); REGISTER_NL_LANGINFO_CONSTANT(ERA_T_FMT); REGISTER_NL_LANGINFO_CONSTANT(ALT_DIGITS); +#ifdef INT_CURR_SYMBOL REGISTER_NL_LANGINFO_CONSTANT(INT_CURR_SYMBOL); +#endif #ifdef CURRENCY_SYMBOL REGISTER_NL_LANGINFO_CONSTANT(CURRENCY_SYMBOL); #endif #ifdef CRNCYSTR REGISTER_NL_LANGINFO_CONSTANT(CRNCYSTR); #endif +#ifdef MON_DECIMAL_POINT REGISTER_NL_LANGINFO_CONSTANT(MON_DECIMAL_POINT); +#endif +#ifdef MON_THOUSANDS_SEP REGISTER_NL_LANGINFO_CONSTANT(MON_THOUSANDS_SEP); +#endif +#ifdef MON_GROUPING REGISTER_NL_LANGINFO_CONSTANT(MON_GROUPING); +#endif +#ifdef POSITIVE_SIGN REGISTER_NL_LANGINFO_CONSTANT(POSITIVE_SIGN); +#endif +#ifdef NEGATIVE_SIGN REGISTER_NL_LANGINFO_CONSTANT(NEGATIVE_SIGN); +#endif +#ifdef INT_FRAC_DIGITS REGISTER_NL_LANGINFO_CONSTANT(INT_FRAC_DIGITS); +#endif +#ifdef FRAC_DIGITS REGISTER_NL_LANGINFO_CONSTANT(FRAC_DIGITS); +#endif +#ifdef P_CS_PRECEDES REGISTER_NL_LANGINFO_CONSTANT(P_CS_PRECEDES); +#endif +#ifdef P_SEP_BY_SPACE REGISTER_NL_LANGINFO_CONSTANT(P_SEP_BY_SPACE); +#endif +#ifdef N_CS_PRECEDES REGISTER_NL_LANGINFO_CONSTANT(N_CS_PRECEDES); +#endif +#ifdef N_SEP_BY_SPACE REGISTER_NL_LANGINFO_CONSTANT(N_SEP_BY_SPACE); +#endif +#ifdef P_SIGN_POSN REGISTER_NL_LANGINFO_CONSTANT(P_SIGN_POSN); +#endif +#ifdef N_SIGN_POSN REGISTER_NL_LANGINFO_CONSTANT(N_SIGN_POSN); +#endif #ifdef DECIMAL_POINT REGISTER_NL_LANGINFO_CONSTANT(DECIMAL_POINT); #endif @@ -326,6 +357,8 @@ #undef REGISTER_NL_LANGINFO_CONSTANT return SUCCESS; } +/* }}} */ + PHP_FUNCTION(nl_langinfo) { zval ** item;