- 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

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"
 

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;

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

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

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

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
 

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
 

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
 

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>

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>

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 */

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"