Added loads of #ifdefs; should fix Bug #11889.

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 7d1b3a59852aa6f949019309765a0b40973d406f..24d1f9de310c1ba4407d3ba70eaf0f19ff542845 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -229,6 +229,7 @@ PHP_FUNCTION(strcspn)
 }
 /* }}} */
 
+/* {{{ PHP_MINIT_FUNCTION(nl_langinfo) */
 #if HAVE_NL_LANGINFO
 PHP_MINIT_FUNCTION(nl_langinfo)
 {
@@ -278,31 +279,61 @@ PHP_MINIT_FUNCTION(nl_langinfo)
        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 @@ PHP_MINIT_FUNCTION(nl_langinfo)
 #undef REGISTER_NL_LANGINFO_CONSTANT
        return SUCCESS;
 }
+/* }}} */
+
 PHP_FUNCTION(nl_langinfo)
 {
        zval ** item;