cvs: php-src(PHP_5_1) /sapi/apache php_apache.c
| From: | Edin Kadribasic | Date: | Wed, 26 Apr 2006 09:31:23 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /sapi/apache php_apache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37923@lists.php.net to get a copy of this message | ||
edink Wed Apr 26 09:31:23 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/sapi/apache php_apache.c
Log:
Correctly import external data (#33292)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.3&r2=1.89.2.4&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89.2.3 php-src/sapi/apache/php_apache.c:1.89.2.4
--- php-src/sapi/apache/php_apache.c:1.89.2.3 Sun Jan 1 12:50:18 2006
+++ php-src/sapi/apache/php_apache.c Wed Apr 26 09:31:23 2006
@@ -17,7 +17,7 @@
| David Sklar <sklar@student.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.89.2.3 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: php_apache.c,v 1.89.2.4 2006/04/26 09:31:23 edink Exp $ */
#include "php_apache_http.h"
@@ -34,8 +34,13 @@
#define SECTION(name) PUTS("<h2>" name "</h2>\n")
+#ifndef PHP_WIN32
extern module *top_module;
extern module **ap_loaded_modules;
+#else
+extern __declspec(dllimport) module *top_module;
+extern __declspec(dllimport) module **ap_loaded_modules;
+#endif
PHP_FUNCTION(virtual);
PHP_FUNCTION(apache_request_headers);