- Finally rename modules.h to zend_modules.h for consistency (first try

  was 2000-03-11).
- Remove the first_arg_force_ref[]; and friends extern from php.h as they
  are included via zend_API.h

diff --git a/configure.in b/configure.in
index 3588023ccd6d1a20c2f476525d0e0799f4923868..9e30ddcdf6e7ead4f4cc85846fe75dfd7e9c2c76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -699,7 +699,7 @@ else
   PART2=non-zts
 fi
 
-ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
+ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
 
 EXTENSION_DIR="$prefix/lib/php/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO"
 

diff --git a/ext/gettext/php_gettext.h b/ext/gettext/php_gettext.h
index 58a215b34c66d68dfbcda0bed01b24005857d196..c7323831ddab7e10b3ba1470bc243e5f452c7799 100644 (file)
--- a/ext/gettext/php_gettext.h
+++ b/ext/gettext/php_gettext.h
@@ -23,7 +23,7 @@
 
 #if HAVE_LIBINTL
 #ifndef INIT_FUNC_ARGS
-#include "modules.h"
+#include "zend_modules.h"
 #endif
 
 extern zend_module_entry php_gettext_module_entry;

diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c
index 308a20d92069f007128247d97125089df2d84d43..e7455b25320059280f25a784eefeb150fb0f6815 100644 (file)
--- a/ext/icap/php_icap.c
+++ b/ext/icap/php_icap.c
@@ -45,7 +45,7 @@
 #include <stdarg.h>
 #include "cal.h"
 #include "php_icap.h"
-#include "modules.h"
+#include "zend_modules.h"
 #include "ext/standard/info.h"
 #include "ext/standard/basic_functions.h"
 #ifdef PHP_WIN32

diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h
index cbdd491a9f7e38b5ecd6c90d41cf51993ce5199a..ba637af2827ee72b427d9b3203171071939f49b6 100644 (file)
--- a/ext/imap/php_imap.h
+++ b/ext/imap/php_imap.h
@@ -15,7 +15,7 @@
  #include "rfc822.h" 
 #endif
 
-#include "modules.h"
+#include "zend_modules.h"
 
 extern zend_module_entry imap_module_entry;
 #define imap_module_ptr &imap_module_entry

diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index 897dbda915d64e9ac2056c404119d896908e4d11..b3e3f04710ff90cdc0cb49d78d331b5f74ceaddb 100644 (file)
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -34,7 +34,7 @@
 #include <stdarg.h>
 #include "mcal.h"
 #include "php_mcal.h"
-#include "modules.h"
+#include "zend_modules.h"
 #include "ext/standard/info.h"
 #include "ext/standard/basic_functions.h"
 #ifdef PHP_WIN32

diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h
index 849cd4a646f648ae632f7fad851dce987a4d7c77..3858abdf2a2223c2de1fc9d845473deca0caf2bd 100644 (file)
--- a/ext/mcrypt/php_mcrypt.h
+++ b/ext/mcrypt/php_mcrypt.h
@@ -9,7 +9,7 @@
 
 #if PHP_API_VERSION < 19990421
 #define  zend_module_entry zend_module_entry
-#include "modules.h"
+#include "zend_modules.h"
 #include "internal_functions.h"
 #endif
 

diff --git a/ext/mhash/php_mhash.h b/ext/mhash/php_mhash.h
index ceacfe513003838fbf8b2b90238f8f5518a97513..9acd447d81afeaf369ab2a810ece551fee24dd46 100644 (file)
--- a/ext/mhash/php_mhash.h
+++ b/ext/mhash/php_mhash.h
@@ -5,7 +5,7 @@
 
 #if PHP_API_VERSION < 19990421
 #define  zend_module_entry zend_module_entry
-#include "modules.h"
+#include "zend_modules.h"
 #include "internal_functions.h"
 #endif
 

diff --git a/ext/ovrimos/php_ovrimos.h b/ext/ovrimos/php_ovrimos.h
index 66099afbb3837f1d4641b6c1ff45d2ed0ba8b051..9ec97669e260503aed8af1fcadd5311b4be3cc20 100644 (file)
--- a/ext/ovrimos/php_ovrimos.h
+++ b/ext/ovrimos/php_ovrimos.h
@@ -5,7 +5,7 @@
 
 #if PHP_API_VERSION < 19990421
 #define  zend_module_entry zend_module_entry
-#include "modules.h"
+#include "zend_modules.h"
 #include "internal_functions.h"
 #endif
 

diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 483ad4c05938b59be7979bac0a431869a7d35403..e304665c844b403ea61af9c610d395456b04cd83 100644 (file)
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -22,7 +22,7 @@
 
 #include "php.h"
 #include "php_main.h"
-#include "modules.h"
+#include "zend_modules.h"
 #include "internal_functions_registry.h"
 #include "zend_compile.h"
 #include <stdarg.h>

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index e2adc6cec2220eef804c8016871da34cf4e655d8..df1be38a4a069f333d3ec8775afeb11e15d926b5 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -23,7 +23,7 @@
 
 #include "php.h"
 #include "php_main.h"
-#include "modules.h"
+#include "zend_modules.h"
 #include "internal_functions_registry.h"
 #include "zend_compile.h"
 #include <stdarg.h>

diff --git a/main/php.h b/main/php.h
index 7429ac005d92eb5c09d952cd1e4fa5d7f33715bb..030159458d7513eba47b5fac73c4415e7c13f540 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -55,11 +55,6 @@
 #define PHP_DIR_SEPARATOR '/'
 #endif
 
-PHPAPI extern unsigned char first_arg_force_ref[];
-PHPAPI extern unsigned char first_arg_allow_ref[];
-PHPAPI extern unsigned char second_arg_force_ref[];
-PHPAPI extern unsigned char second_arg_allow_ref[];
-
 #include "php_regex.h"
 
 /* PHP's DEBUG value must match Zend's ZEND_DEBUG value */

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index c82918081556abe7773b564406f9275a5e4532ff..1423c387e4a9a69e923f28315c0e22934135334c 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -22,7 +22,7 @@
 #include "php.h"
 #include "php_globals.h"
 #include "php_variables.h"
-#include "modules.h"
+#include "zend_modules.h"
 
 #include "SAPI.h"