Fix Win32 linkage problems

18 files changed, 59 insertions, 0 deletions

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index c549ea2983..e606881e05 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -96,6 +96,9 @@ zend_module_entry curl_module_entry = {
 
 #ifdef COMPILE_DL_CURL
 ZEND_GET_MODULE (curl)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 /* {{{ PHP_MINFO_FUNCTION
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 1363b6710d..4ae71cae86 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -99,6 +99,9 @@ zend_module_entry gmp_module_entry = {
 
 #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);
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 71f06b1731..697855a9bf 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -180,6 +180,9 @@ zend_module_entry ldap_module_entry = {
 
 #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)
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 3d026a928e..281d41e04d 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -227,6 +227,9 @@ ZEND_DECLARE_MODULE_GLOBALS(mbstring)
 
 #ifdef COMPILE_DL_MBSTRING
 ZEND_GET_MODULE(mbstring)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 /* {{{ allocators */
diff --git a/ext/mcve/mcve.c b/ext/mcve/mcve.c
index cc7197ad6a..4d8ea86658 100644
--- a/ext/mcve/mcve.c
+++ b/ext/mcve/mcve.c
@@ -150,6 +150,9 @@ zend_module_entry mcve_module_entry = {
 /* 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 */
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 64c562d8b4..559f21c161 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -99,6 +99,9 @@ ZEND_DECLARE_MODULE_GLOBALS(mssql)
 
 #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; } }
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index d823678fc3..258a149953 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -144,6 +144,9 @@ PHP_OCI_API php_oci_globals oci_globals;
 
 #ifdef COMPILE_DL_OCI8
 ZEND_GET_MODULE(oci8)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif /* COMPILE_DL */
 
 /* }}} */
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 0adcc7cad8..5903fcd6c5 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -154,6 +154,9 @@ ZEND_API php_odbc_globals odbc_globals;
 
 #ifdef COMPILE_DL_ODBC
 ZEND_GET_MODULE(odbc)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 /* {{{ _free_odbc_result
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 071b5027a6..2618379674 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -145,6 +145,9 @@ zend_module_entry openssl_module_entry = {
 
 #ifdef COMPILE_DL_OPENSSL
 ZEND_GET_MODULE(openssl)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 static int le_key;
diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 431e72162c..7f4b279412 100644
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -195,6 +195,9 @@ static const text *ora_func_tab[] =
 
 #ifdef COMPILE_DL_ORACLE
 ZEND_GET_MODULE(oracle)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 /* {{{ _close_oraconn
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 6f3a5a9ccd..138021a514 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -75,6 +75,9 @@ zend_module_entry pcntl_module_entry = {
 
 #ifdef COMPILE_DL_PCNTL
 ZEND_GET_MODULE(pcntl)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 static void pcntl_signal_handler(int);
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index e88c222ea3..b2c314ba76 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1529,6 +1529,9 @@ zend_module_entry pcre_module_entry = {
 
 #ifdef COMPILE_DL_PCRE
 ZEND_GET_MODULE(pcre)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 /* }}} */
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index d782f2629e..ed1dda7bc9 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -175,6 +175,9 @@ zend_module_entry sockets_module_entry = {
 
 #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 */
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 5b1eb922d9..85e3f6691e 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -276,6 +276,9 @@ zend_module_entry sqlite_module_entry = {
 
 #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)
@@ -1754,10 +1757,15 @@ PHP_FUNCTION(sqlite_fetch_object)
 		}
 		fci.no_separation = 1;
 	
+
 		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);
diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index 73870fe6a0..a39ceb89a3 100644
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -95,6 +95,9 @@ zend_module_entry sysvmsg_module_entry = {
 
 #ifdef COMPILE_DL_SYSVMSG
 ZEND_GET_MODULE(sysvmsg)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 /* {{{ PHP_INI
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 210d25648d..10b49119c3 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -63,6 +63,9 @@ PHP_XML_API php_xml_globals xml_globals;
 /* {{{ 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 */
 /* }}} */
 
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 6d5c0d34fa..f5f4e5f9ba 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -113,6 +113,9 @@ zend_module_entry xmlrpc_module_entry = {
 
 #ifdef COMPILE_DL_XMLRPC
 ZEND_GET_MODULE(xmlrpc)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 /*******************************
diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index 48fdaa89af..23e1c0c12b 100644
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -1604,6 +1604,9 @@ zend_module_entry yaz_module_entry = {
 
 #ifdef COMPILE_DL_YAZ
 ZEND_GET_MODULE(yaz)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
 #endif
 
 #endif