cvs: php4 /ext/standard string.c
| From: | Wez Furlong | Date: | Fri, 10 Aug 2001 18:02:59 +0000 |
| Subject: | cvs: php4 /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6714@lists.php.net to get a copy of this message | ||
wez Fri Aug 10 14:02:59 2001 EDT
Modified files:
/php4/ext/standard string.c
Log:
Fix some build probs on *bsd
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.222 php4/ext/standard/string.c:1.223
--- php4/ext/standard/string.c:1.222 Sun Aug 5 23:50:51 2001
+++ php4/ext/standard/string.c Fri Aug 10 14:02:59 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.222 2001/08/06 03:50:51 sas Exp $ */
+/* $Id: string.c,v 1.223 2001/08/10 18:02:59 wez Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -230,6 +230,7 @@
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 @@
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 @@
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 @@
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 @@
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