cvs: /php4 php4dllts.dsp /php4/ext/standard assert.c
| From: | Sam Ruby | Date: | Tue, 07 Dec 1999 16:28:58 +0000 |
| Subject: | cvs: /php4 php4dllts.dsp /php4/ext/standard assert.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7617@lists.php.net to get a copy of this message | ||
rubys Tue Dec 7 11:28:58 1999 EDT
Modified files:
/php4 php4dllts.dsp
/php4/ext/standard assert.c
Log:
fixed just enough to enable assert to build on win32 and Linux/ZTS
Index: php4/php4dllts.dsp
diff -u php4/php4dllts.dsp:1.38 php4/php4dllts.dsp:1.39
--- php4/php4dllts.dsp:1.38 Sat Dec 4 18:53:08 1999
+++ php4/php4dllts.dsp Tue Dec 7 11:28:26 1999
@@ -279,6 +279,10 @@
# End Source File
# Begin Source File
+SOURCE=.\ext\standard\assert.c
+# End Source File
+# Begin Source File
+
SOURCE=.\ext\standard\base64.c
# End Source File
# Begin Source File
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.4 php4/ext/standard/assert.c:1.5
--- php4/ext/standard/assert.c:1.4 Tue Dec 7 08:33:37 1999
+++ php4/ext/standard/assert.c Tue Dec 7 11:28:27 1999
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.4 1999/12/07 13:33:37 thies Exp $ */
+/* $Id: assert.c,v 1.5 1999/12/07 16:28:27 rubys Exp $ */
/* {{{ includes/startup/misc */
@@ -82,10 +82,15 @@
PHP_INI_ENTRY("assert.callback", NULL, PHP_INI_ALL, NULL)
PHP_INI_END()
+static void php_assert_init_globals(php_assert_globals *assert_globals)
+{
+}
+
PHP_MINIT_FUNCTION(assert)
{
#ifdef ZTS
+ ELS_FETCH();
assert_globals_id = ts_allocate_id(sizeof(php_assert_globals), (ts_allocate_ctor)
php_assert_init_globals, NULL);
#endif