Fix some build probs on *bsd

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 1b7bc6424d195f5939facf15b46908ef5e58eb4a..46073764437e110c014d3d604da1cd21a7c925f3 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -230,6 +230,7 @@ PHP_FUNCTION(strcspn)
 PHP_MINIT_FUNCTION(nl_langinfo)
 {
 #define REGISTER_NL_LANGINFO_CONSTANT(x)       REGISTER_LONG_CONSTANT(#x, x, CONST_CS | CONST_PERSISTENT)
+#ifdef ABDAY_1
        REGISTER_NL_LANGINFO_CONSTANT(ABDAY_1);
        REGISTER_NL_LANGINFO_CONSTANT(ABDAY_2);
        REGISTER_NL_LANGINFO_CONSTANT(ABDAY_3);
@@ -237,6 +238,8 @@ PHP_MINIT_FUNCTION(nl_langinfo)
        REGISTER_NL_LANGINFO_CONSTANT(ABDAY_5);
        REGISTER_NL_LANGINFO_CONSTANT(ABDAY_6);
        REGISTER_NL_LANGINFO_CONSTANT(ABDAY_7);
+#endif
+#ifdef DAY_1
        REGISTER_NL_LANGINFO_CONSTANT(DAY_1);
        REGISTER_NL_LANGINFO_CONSTANT(DAY_2);
        REGISTER_NL_LANGINFO_CONSTANT(DAY_3);
@@ -244,6 +247,8 @@ PHP_MINIT_FUNCTION(nl_langinfo)
        REGISTER_NL_LANGINFO_CONSTANT(DAY_5);
        REGISTER_NL_LANGINFO_CONSTANT(DAY_6);
        REGISTER_NL_LANGINFO_CONSTANT(DAY_7);
+#endif
+#ifdef ABMON_1
        REGISTER_NL_LANGINFO_CONSTANT(ABMON_1);
        REGISTER_NL_LANGINFO_CONSTANT(ABMON_2);
        REGISTER_NL_LANGINFO_CONSTANT(ABMON_3);
@@ -256,6 +261,8 @@ PHP_MINIT_FUNCTION(nl_langinfo)
        REGISTER_NL_LANGINFO_CONSTANT(ABMON_10);
        REGISTER_NL_LANGINFO_CONSTANT(ABMON_11);
        REGISTER_NL_LANGINFO_CONSTANT(ABMON_12);
+#endif
+#ifdef MON_1
        REGISTER_NL_LANGINFO_CONSTANT(MON_1);
        REGISTER_NL_LANGINFO_CONSTANT(MON_2);
        REGISTER_NL_LANGINFO_CONSTANT(MON_3);
@@ -268,20 +275,43 @@ PHP_MINIT_FUNCTION(nl_langinfo)
        REGISTER_NL_LANGINFO_CONSTANT(MON_10);
        REGISTER_NL_LANGINFO_CONSTANT(MON_11);
        REGISTER_NL_LANGINFO_CONSTANT(MON_12);
+#endif
+#ifdef AM_STR
        REGISTER_NL_LANGINFO_CONSTANT(AM_STR);
+#endif
+#ifdef PM_STR
        REGISTER_NL_LANGINFO_CONSTANT(PM_STR);
+#endif
+#ifdef D_T_FMT
        REGISTER_NL_LANGINFO_CONSTANT(D_T_FMT);
+#endif
+#ifdef D_FMT
        REGISTER_NL_LANGINFO_CONSTANT(D_FMT);
+#endif
+#ifdef T_FMT
        REGISTER_NL_LANGINFO_CONSTANT(T_FMT);
+#endif
+#ifdef T_FMT_AMPM
        REGISTER_NL_LANGINFO_CONSTANT(T_FMT_AMPM);
+#endif
+#ifdef ERA
        REGISTER_NL_LANGINFO_CONSTANT(ERA);
+#endif
 #ifdef ERA_YEAR
        REGISTER_NL_LANGINFO_CONSTANT(ERA_YEAR);
 #endif
+#ifdef ERA_D_T_FMT
        REGISTER_NL_LANGINFO_CONSTANT(ERA_D_T_FMT);
+#endif
+#ifdef ERA_D_FMT
        REGISTER_NL_LANGINFO_CONSTANT(ERA_D_FMT);
+#endif
+#ifdef ERA_T_FMT
        REGISTER_NL_LANGINFO_CONSTANT(ERA_T_FMT);
+#endif
+#ifdef ALT_DIGITS
        REGISTER_NL_LANGINFO_CONSTANT(ALT_DIGITS);
+#endif
 #ifdef INT_CURR_SYMBOL
        REGISTER_NL_LANGINFO_CONSTANT(INT_CURR_SYMBOL);
 #endif