cvs: php4 /ext/standard string.c /ext/wddx wddx.c /win32 sendmail.c
| From: | Andi Gutmans | Date: | Sat, 17 Jun 2000 14:48:03 +0000 |
| Subject: | cvs: php4 /ext/standard string.c /ext/wddx wddx.c /win32 sendmail.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-336@lists.php.net to get a copy of this message | ||
andi Sat Jun 17 07:48:03 2000 EDT
Modified files:
/php4/ext/standard string.c
/php4/ext/wddx wddx.c
/php4/win32 sendmail.c
Log:
- Make Windows compile
- Windows doesn't support LC_MESSAGES
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.129 php4/ext/standard/string.c:1.130
--- php4/ext/standard/string.c:1.129 Fri Jun 16 23:25:47 2000
+++ php4/ext/standard/string.c Sat Jun 17 07:48:02 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.129 2000/06/17 06:25:47 hholzgra Exp $ */
+/* $Id: string.c,v 1.130 2000/06/17 14:48:02 andi Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2126,8 +2126,10 @@
cat = LC_COLLATE;
else if (!strcasecmp ("LC_CTYPE", category->value.str.val))
cat = LC_CTYPE;
+#ifndef PHP_WIN32
else if (!strcasecmp ("LC_MESSAGES", category->value.str.val))
- cat = LC_MESSAGES;
+ cat = LC_MESSAGES;
+#endif
else if (!strcasecmp ("LC_MONETARY", category->value.str.val))
cat = LC_MONETARY;
else if (!strcasecmp ("LC_NUMERIC", category->value.str.val))
Index: php4/ext/wddx/wddx.c
diff -u php4/ext/wddx/wddx.c:1.41 php4/ext/wddx/wddx.c:1.42
--- php4/ext/wddx/wddx.c:1.41 Fri Jun 16 12:55:51 2000
+++ php4/ext/wddx/wddx.c Sat Jun 17 07:48:03 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.41 2000/06/16 19:55:51 andrei Exp $ */
+/* $Id: wddx.c,v 1.42 2000/06/17 14:48:03 andi Exp $ */
#include "php.h"
#include "php_wddx.h"
@@ -387,6 +387,7 @@
char *key;
ulong idx;
char tmp_buf[WDDX_BUF_LEN];
+ CLS_FETCH();
MAKE_STD_ZVAL(fname);
ZVAL_STRING(fname, "__sleep", 1);
@@ -462,7 +463,8 @@
ulong idx;
HashTable *target_hash;
char tmp_buf[WDDX_BUF_LEN];
- int ind = 0,type;
+ ulong ind = 0;
+ int type;
target_hash = HASH_OF(arr);
Index: php4/win32/sendmail.c
diff -u php4/win32/sendmail.c:1.7 php4/win32/sendmail.c:1.8
--- php4/win32/sendmail.c:1.7 Fri Jun 16 11:23:57 2000
+++ php4/win32/sendmail.c Sat Jun 17 07:48:03 2000
@@ -144,7 +144,7 @@
}
}
-/'********************************************************************
+//********************************************************************
// Name: TSendMail::~TSendMail
// Input:
// Output: