zeev Sun Aug 31 08:41:54 2003 EDT
Modified files:
/php-src/ext/curl interface.c
/php-src/ext/gmp gmp.c
/php-src/ext/ldap ldap.c
/php-src/ext/mbstring mbstring.c
/php-src/ext/mcve mcve.c
/php-src/ext/mssql php_mssql.c
/php-src/ext/oci8 oci8.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/openssl openssl.c
/php-src/ext/oracle oracle.c
/php-src/ext/pcntl pcntl.c
/php-src/ext/pcre php_pcre.c
/php-src/ext/sockets sockets.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/sysvmsg sysvmsg.c
/php-src/ext/xml xml.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/ext/yaz php_yaz.c
Log:
Fix Win32 linkage problems
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.27 php-src/ext/curl/interface.c:1.28
--- php-src/ext/curl/interface.c:1.27 Tue Aug 5 19:50:59 2003
+++ php-src/ext/curl/interface.c Sun Aug 31 08:41:34 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.27 2003/08/05 23:50:59 sniper Exp $ */
+/* $Id: interface.c,v 1.28 2003/08/31 12:41:34 zeev Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -96,6 +96,9 @@
#ifdef COMPILE_DL_CURL
ZEND_GET_MODULE (curl)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ PHP_MINFO_FUNCTION
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.34 php-src/ext/gmp/gmp.c:1.35
--- php-src/ext/gmp/gmp.c:1.34 Sun Aug 3 13:44:36 2003
+++ php-src/ext/gmp/gmp.c Sun Aug 31 08:41:35 2003
@@ -99,6 +99,9 @@
#ifdef COMPILE_DL_GMP
ZEND_GET_MODULE(gmp)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.144 php-src/ext/ldap/ldap.c:1.145
--- php-src/ext/ldap/ldap.c:1.144 Tue Aug 5 07:54:01 2003
+++ php-src/ext/ldap/ldap.c Sun Aug 31 08:41:36 2003
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.144 2003/08/05 11:54:01 sniper Exp $ */
+/* $Id: ldap.c,v 1.145 2003/08/31 12:41:36 zeev Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -180,6 +180,9 @@
#ifdef COMPILE_DL_LDAP
ZEND_GET_MODULE(ldap)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
static void _close_ldap_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -299,7 +302,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.144 2003/08/05
11:54:01 sniper Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.145 2003/08/31
12:41:36 zeev Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.194 php-src/ext/mbstring/mbstring.c:1.195
--- php-src/ext/mbstring/mbstring.c:1.194 Mon Aug 25 17:54:26 2003
+++ php-src/ext/mbstring/mbstring.c Sun Aug 31 08:41:37 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.194 2003/08/25 21:54:26 helly Exp $ */
+/* $Id: mbstring.c,v 1.195 2003/08/31 12:41:37 zeev Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -227,6 +227,9 @@
#ifdef COMPILE_DL_MBSTRING
ZEND_GET_MODULE(mbstring)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ allocators */
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.25 php-src/ext/mcve/mcve.c:1.26
--- php-src/ext/mcve/mcve.c:1.25 Thu Aug 28 20:53:45 2003
+++ php-src/ext/mcve/mcve.c Sun Aug 31 08:41:38 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mcve.c,v 1.25 2003/08/29 00:53:45 sniper Exp $ */
+/* $Id: mcve.c,v 1.26 2003/08/31 12:41:38 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -150,6 +150,9 @@
/* declare the module for dynamic loading */
#ifdef COMPILE_DL_MCVE
ZEND_GET_MODULE(mcve)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ MCVE_CONN destructor */
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.121 php-src/ext/mssql/php_mssql.c:1.122
--- php-src/ext/mssql/php_mssql.c:1.121 Thu Aug 28 17:00:18 2003
+++ php-src/ext/mssql/php_mssql.c Sun Aug 31 08:41:39 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.121 2003/08/28 21:00:18 andrey Exp $ */
+/* $Id: php_mssql.c,v 1.122 2003/08/31 12:41:39 zeev Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -99,6 +99,9 @@
#ifdef COMPILE_DL_MSSQL
ZEND_GET_MODULE(mssql)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC,
E_WARNING, "A link to the server could not be established"); RETURN_FALSE; } }
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.215 php-src/ext/oci8/oci8.c:1.216
--- php-src/ext/oci8/oci8.c:1.215 Tue Aug 12 07:37:40 2003
+++ php-src/ext/oci8/oci8.c Sun Aug 31 08:41:40 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.215 2003/08/12 11:37:40 andrey Exp $ */
+/* $Id: oci8.c,v 1.216 2003/08/31 12:41:40 zeev Exp $ */
/* TODO list:
*
@@ -144,6 +144,9 @@
#ifdef COMPILE_DL_OCI8
ZEND_GET_MODULE(oci8)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif /* COMPILE_DL */
/* }}} */
@@ -644,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.215 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.216 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.174 php-src/ext/odbc/php_odbc.c:1.175
--- php-src/ext/odbc/php_odbc.c:1.174 Thu Aug 28 12:35:32 2003
+++ php-src/ext/odbc/php_odbc.c Sun Aug 31 08:41:41 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.174 2003/08/28 16:35:32 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.175 2003/08/31 12:41:41 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -154,6 +154,9 @@
#ifdef COMPILE_DL_ODBC
ZEND_GET_MODULE(odbc)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ _free_odbc_result
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.79 php-src/ext/openssl/openssl.c:1.80
--- php-src/ext/openssl/openssl.c:1.79 Sun Aug 3 13:44:37 2003
+++ php-src/ext/openssl/openssl.c Sun Aug 31 08:41:42 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.79 2003/08/03 17:44:37 zeev Exp $ */
+/* $Id: openssl.c,v 1.80 2003/08/31 12:41:42 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -145,6 +145,9 @@
#ifdef COMPILE_DL_OPENSSL
ZEND_GET_MODULE(openssl)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
static int le_key;
Index: php-src/ext/oracle/oracle.c
diff -u php-src/ext/oracle/oracle.c:1.92 php-src/ext/oracle/oracle.c:1.93
--- php-src/ext/oracle/oracle.c:1.92 Mon Aug 11 20:55:56 2003
+++ php-src/ext/oracle/oracle.c Sun Aug 31 08:41:44 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oracle.c,v 1.92 2003/08/12 00:55:56 iliaa Exp $ */
+/* $Id: oracle.c,v 1.93 2003/08/31 12:41:44 zeev Exp $ */
/* comment out the next line if you're on Oracle 7.x and don't have the olog
call. */
@@ -195,6 +195,9 @@
#ifdef COMPILE_DL_ORACLE
ZEND_GET_MODULE(oracle)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ _close_oraconn
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.36 php-src/ext/pcntl/pcntl.c:1.37
--- php-src/ext/pcntl/pcntl.c:1.36 Sun Jun 22 10:33:04 2003
+++ php-src/ext/pcntl/pcntl.c Sun Aug 31 08:41:45 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.36 2003/06/22 14:33:04 andrey Exp $ */
+/* $Id: pcntl.c,v 1.37 2003/08/31 12:41:45 zeev Exp $ */
#define PCNTL_DEBUG 0
@@ -75,6 +75,9 @@
#ifdef COMPILE_DL_PCNTL
ZEND_GET_MODULE(pcntl)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
static void pcntl_signal_handler(int);
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.144 php-src/ext/pcre/php_pcre.c:1.145
--- php-src/ext/pcre/php_pcre.c:1.144 Thu Aug 28 13:09:44 2003
+++ php-src/ext/pcre/php_pcre.c Sun Aug 31 08:41:46 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.144 2003/08/28 17:09:44 sas Exp $ */
+/* $Id: php_pcre.c,v 1.145 2003/08/31 12:41:46 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1529,6 +1529,9 @@
#ifdef COMPILE_DL_PCRE
ZEND_GET_MODULE(pcre)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* }}} */
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.151 php-src/ext/sockets/sockets.c:1.152
--- php-src/ext/sockets/sockets.c:1.151 Sat Aug 16 02:34:36 2003
+++ php-src/ext/sockets/sockets.c Sun Aug 31 08:41:47 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.151 2003/08/16 06:34:36 jason Exp $ */
+/* $Id: sockets.c,v 1.152 2003/08/31 12:41:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -175,6 +175,9 @@
#ifdef COMPILE_DL_SOCKETS
ZEND_GET_MODULE(sockets)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* inet_ntop should be used instead of inet_ntoa */
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.90 php-src/ext/sqlite/sqlite.c:1.91
--- php-src/ext/sqlite/sqlite.c:1.90 Fri Aug 29 19:30:03 2003
+++ php-src/ext/sqlite/sqlite.c Sun Aug 31 08:41:48 2003
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.90 2003/08/29 23:30:03 helly Exp $
+ $Id: sqlite.c,v 1.91 2003/08/31 12:41:48 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -276,6 +276,9 @@
#ifdef COMPILE_DL_SQLITE
ZEND_GET_MODULE(sqlite)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
static int php_sqlite_callback_invalidator(struct php_sqlite_agg_functions *funcs
TSRMLS_DC)
@@ -941,7 +944,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.90 2003/08/29 23:30:03 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.91 2003/08/31 12:41:48 zeev Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1753,11 +1756,16 @@
fci.params = NULL;
}
fci.no_separation = 1;
-
- fcc.initialized = 1;
- fcc.function_handler = ce->constructor;
- fcc.calling_scope = EG(scope);
- fcc.object_pp = &return_value;
+
+
+ fcc.initialized = 1;
+
+ fcc.function_handler = ce->constructor;
+
+ fcc.calling_scope = EG(scope);
+
+ fcc.object_pp = &return_value;
+
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
zend_throw_exception_ex(sqlite_ce_exception, 0 TSRMLS_CC,
"Could not execute %s::%s()", class_name, ce->constructor->common.function_name);
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.13 php-src/ext/sysvmsg/sysvmsg.c:1.14
--- php-src/ext/sysvmsg/sysvmsg.c:1.13 Sun Aug 3 13:44:38 2003
+++ php-src/ext/sysvmsg/sysvmsg.c Sun Aug 31 08:41:49 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.13 2003/08/03 17:44:38 zeev Exp $ */
+/* $Id: sysvmsg.c,v 1.14 2003/08/31 12:41:49 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -95,6 +95,9 @@
#ifdef COMPILE_DL_SYSVMSG
ZEND_GET_MODULE(sysvmsg)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ PHP_INI
@@ -139,7 +142,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.13 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.14 $");
php_info_print_table_end();
}
/* }}} */
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.139 php-src/ext/xml/xml.c:1.140
--- php-src/ext/xml/xml.c:1.139 Mon Aug 11 20:55:55 2003
+++ php-src/ext/xml/xml.c Sun Aug 31 08:41:50 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.139 2003/08/12 00:55:55 iliaa Exp $ */
+/* $Id: xml.c,v 1.140 2003/08/31 12:41:50 zeev Exp $ */
#define IS_EXT_MODULE
@@ -63,6 +63,9 @@
/* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_XML
ZEND_GET_MODULE(xml)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif /* COMPILE_DL_XML */
/* }}} */
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.33
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.34
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.33 Sun Aug 3 13:44:38 2003
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Sun Aug 31 08:41:52 2003
@@ -51,7 +51,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.33 2003/08/03 17:44:38 zeev Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.34 2003/08/31 12:41:52 zeev Exp $ */
/**********************************************************************
* BUGS: *
@@ -113,6 +113,9 @@
#ifdef COMPILE_DL_XMLRPC
ZEND_GET_MODULE(xmlrpc)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/*******************************
Index: php-src/ext/yaz/php_yaz.c
diff -u php-src/ext/yaz/php_yaz.c:1.79 php-src/ext/yaz/php_yaz.c:1.80
--- php-src/ext/yaz/php_yaz.c:1.79 Sun Aug 3 13:44:38 2003
+++ php-src/ext/yaz/php_yaz.c Sun Aug 31 08:41:53 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_yaz.c,v 1.79 2003/08/03 17:44:38 zeev Exp $ */
+/* $Id: php_yaz.c,v 1.80 2003/08/31 12:41:53 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1604,6 +1604,9 @@
#ifdef COMPILE_DL_YAZ
ZEND_GET_MODULE(yaz)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
