diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ext/gettext/php_gettext.h | 2 | ||||
| -rw-r--r-- | ext/icap/php_icap.c | 2 | ||||
| -rw-r--r-- | ext/imap/php_imap.h | 2 | ||||
| -rw-r--r-- | ext/mcal/php_mcal.c | 2 | ||||
| -rw-r--r-- | ext/mcrypt/php_mcrypt.h | 2 | ||||
| -rw-r--r-- | ext/mhash/php_mhash.h | 2 | ||||
| -rw-r--r-- | ext/ovrimos/php_ovrimos.h | 2 | ||||
| -rw-r--r-- | main/internal_functions.c.in | 2 | ||||
| -rw-r--r-- | main/internal_functions_win32.c | 2 | ||||
| -rw-r--r-- | main/php.h | 5 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 |
12 files changed, 11 insertions, 16 deletions
diff --git a/configure.in b/configure.in index 3588023ccd..9e30ddcdf6 100644 --- 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 58a215b34c..c7323831dd 100644 --- 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 308a20d920..e7455b2532 100644 --- 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 cbdd491a9f..ba637af282 100644 --- 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 897dbda915..b3e3f04710 100644 --- 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 849cd4a646..3858abdf2a 100644 --- 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 ceacfe5130..9acd447d81 100644 --- 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 66099afbb3..9ec97669e2 100644 --- 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 483ad4c059..e304665c84 100644 --- 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 e2adc6cec2..df1be38a4a 100644 --- 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 7429ac005d..030159458d 100644 --- 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 c829180815..1423c387e4 100644 --- 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" |