Attempt at fixing the linkage problem in Win32

diff --git a/Zend/zend_arg_defs.c b/Zend/zend_arg_defs.c
new file mode 100644 (file)
index 0000000..8570d38
--- /dev/null
+++ b/Zend/zend_arg_defs.c
@@ -0,0 +1,27 @@
+ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0)
+       ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+
+
+ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+
+
+ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1)
+ZEND_END_ARG_INFO();
+

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 8aa08d55e185089b96aa9a4a80ede946da6b838b..93abe83e509f8559c870b145f1a9a4b0cb4c21f9 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -80,37 +80,8 @@ static ZEND_FUNCTION(zend_thread_id);
 #endif
 #endif
 
-ZEND_API
-       ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0)
-               ZEND_ARG_PASS_INFO(1)
-       ZEND_END_ARG_INFO();
-
-
-ZEND_API
-       ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0)
-               ZEND_ARG_PASS_INFO(0)
-               ZEND_ARG_PASS_INFO(1)
-       ZEND_END_ARG_INFO();
-
-ZEND_API
-       ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0)
-               ZEND_ARG_PASS_INFO(0)
-               ZEND_ARG_PASS_INFO(0)
-               ZEND_ARG_PASS_INFO(1)
-       ZEND_END_ARG_INFO();
-
-
-ZEND_API
-       ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0)
-               ZEND_ARG_PASS_INFO(0)
-               ZEND_ARG_PASS_INFO(0)
-               ZEND_ARG_PASS_INFO(0)
-               ZEND_ARG_PASS_INFO(1)
-       ZEND_END_ARG_INFO();
-
-ZEND_API
-       ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1)
-       ZEND_END_ARG_INFO();
+#include "zend_arg_defs.c"
+
 
 static zend_function_entry builtin_functions[] = {
        ZEND_FE(zend_version,           NULL)

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 1d56f1e89af5d48262df9e8967136b2057742674..bde150364e9c03d111cd77964772f7105db4e02f 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -31,11 +31,11 @@
 #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC
 #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC
 
-ZEND_API extern struct _zend_arg_info first_arg_force_ref[2];
-ZEND_API extern struct _zend_arg_info second_arg_force_ref[3];
-ZEND_API extern struct _zend_arg_info third_arg_force_ref[4];
-ZEND_API extern struct _zend_arg_info fourth_arg_force_ref[5];
-ZEND_API extern struct _zend_arg_info all_args_by_ref[1];
+extern struct _zend_arg_info first_arg_force_ref[2];
+extern struct _zend_arg_info second_arg_force_ref[3];
+extern struct _zend_arg_info third_arg_force_ref[4];
+extern struct _zend_arg_info fourth_arg_force_ref[5];
+extern struct _zend_arg_info all_args_by_ref[1];
 
 #define ZEND_MODULE_API_NO 20020429
 #ifdef ZTS