andi Mon Feb 26 10:14:32 2001 EDT
Modified files:
/php4 configure.in
/php4/ext/gettext php_gettext.h
/php4/ext/icap php_icap.c
/php4/ext/imap php_imap.h
/php4/ext/mcal php_mcal.c
/php4/ext/mcrypt php_mcrypt.h
/php4/ext/mhash php_mhash.h
/php4/ext/midgard php_midgard.h
/php4/ext/ovrimos php_ovrimos.h
/php4/main internal_functions.c.in internal_functions_win32.c php.h
/php4/sapi/cgi cgi_main.c
Log:
- 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
Index: php4/configure.in
diff -u php4/configure.in:1.218 php4/configure.in:1.219
--- php4/configure.in:1.218 Wed Feb 14 21:21:27 2001
+++ php4/configure.in Mon Feb 26 10:14:27 2001
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.218 2001/02/15 05:21:27 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.219 2001/02/26 18:14:27 andi Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -699,7 +699,7 @@
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"
Index: php4/ext/gettext/php_gettext.h
diff -u php4/ext/gettext/php_gettext.h:1.10 php4/ext/gettext/php_gettext.h:1.11
--- php4/ext/gettext/php_gettext.h:1.10 Sun Feb 25 22:06:56 2001
+++ php4/ext/gettext/php_gettext.h Mon Feb 26 10:14:28 2001
@@ -16,14 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gettext.h,v 1.10 2001/02/26 06:06:56 andi Exp $ */
+/* $Id: php_gettext.h,v 1.11 2001/02/26 18:14:28 andi Exp $ */
#ifndef PHP_GETTEXT_H
#define PHP_GETTEXT_H
#if HAVE_LIBINTL
#ifndef INIT_FUNC_ARGS
-#include "modules.h"
+#include "zend_modules.h"
#endif
extern zend_module_entry php_gettext_module_entry;
Index: php4/ext/icap/php_icap.c
diff -u php4/ext/icap/php_icap.c:1.21 php4/ext/icap/php_icap.c:1.22
--- php4/ext/icap/php_icap.c:1.21 Wed Oct 25 10:43:51 2000
+++ php4/ext/icap/php_icap.c Mon Feb 26 10:14:28 2001
@@ -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
Index: php4/ext/imap/php_imap.h
diff -u php4/ext/imap/php_imap.h:1.7 php4/ext/imap/php_imap.h:1.8
--- php4/ext/imap/php_imap.h:1.7 Mon Feb 26 07:17:12 2001
+++ php4/ext/imap/php_imap.h Mon Feb 26 10:14:28 2001
@@ -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
Index: php4/ext/mcal/php_mcal.c
diff -u php4/ext/mcal/php_mcal.c:1.40 php4/ext/mcal/php_mcal.c:1.41
--- php4/ext/mcal/php_mcal.c:1.40 Sun Feb 25 22:07:01 2001
+++ php4/ext/mcal/php_mcal.c Mon Feb 26 10:14:28 2001
@@ -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
Index: php4/ext/mcrypt/php_mcrypt.h
diff -u php4/ext/mcrypt/php_mcrypt.h:1.15 php4/ext/mcrypt/php_mcrypt.h:1.16
--- php4/ext/mcrypt/php_mcrypt.h:1.15 Sun Aug 13 04:53:04 2000
+++ php4/ext/mcrypt/php_mcrypt.h Mon Feb 26 10:14:29 2001
@@ -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
Index: php4/ext/mhash/php_mhash.h
diff -u php4/ext/mhash/php_mhash.h:1.6 php4/ext/mhash/php_mhash.h:1.7
--- php4/ext/mhash/php_mhash.h:1.6 Wed Oct 25 11:09:23 2000
+++ php4/ext/mhash/php_mhash.h Mon Feb 26 10:14:29 2001
@@ -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
Index: php4/ext/midgard/php_midgard.h
diff -u php4/ext/midgard/php_midgard.h:1.6 php4/ext/midgard/php_midgard.h:1.7
--- php4/ext/midgard/php_midgard.h:1.6 Sat Feb 24 13:12:11 2001
+++ php4/ext/midgard/php_midgard.h Mon Feb 26 10:14:29 2001
@@ -1,4 +1,4 @@
-/* $Id: php_midgard.h,v 1.6 2001/02/24 21:12:11 davidg Exp $
+/* $Id: php_midgard.h,v 1.7 2001/02/26 18:14:29 andi Exp $
Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -31,7 +31,7 @@
#include <php.h>
#include <midgard/midgard.h>
#include <midgard/apache.h>
-#include <Zend/modules.h>
+#include <Zend/zend_modules.h>
midgard_request_config *mgd_rcfg();
midgard_directory_config *mgd_dcfg();
Index: php4/ext/ovrimos/php_ovrimos.h
diff -u php4/ext/ovrimos/php_ovrimos.h:1.1 php4/ext/ovrimos/php_ovrimos.h:1.2
--- php4/ext/ovrimos/php_ovrimos.h:1.1 Wed Oct 11 09:54:22 2000
+++ php4/ext/ovrimos/php_ovrimos.h Mon Feb 26 10:14:29 2001
@@ -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
Index: php4/main/internal_functions.c.in
diff -u php4/main/internal_functions.c.in:1.18 php4/main/internal_functions.c.in:1.19
--- php4/main/internal_functions.c.in:1.18 Sun Feb 25 22:07:31 2001
+++ php4/main/internal_functions.c.in Mon Feb 26 10:14:30 2001
@@ -18,11 +18,11 @@
*/
-/* $Id: internal_functions.c.in,v 1.18 2001/02/26 06:07:31 andi Exp $ */
+/* $Id: internal_functions.c.in,v 1.19 2001/02/26 18:14:30 andi Exp $ */
#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>
Index: php4/main/internal_functions_win32.c
diff -u php4/main/internal_functions_win32.c:1.37
php4/main/internal_functions_win32.c:1.38
--- php4/main/internal_functions_win32.c:1.37 Sun Feb 25 22:07:31 2001
+++ php4/main/internal_functions_win32.c Mon Feb 26 10:14:30 2001
@@ -18,12 +18,12 @@
*/
-/* $Id: internal_functions_win32.c,v 1.37 2001/02/26 06:07:31 andi Exp $ */
+/* $Id: internal_functions_win32.c,v 1.38 2001/02/26 18:14:30 andi Exp $ */
#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>
Index: php4/main/php.h
diff -u php4/main/php.h:1.133 php4/main/php.h:1.134
--- php4/main/php.h:1.133 Mon Feb 26 08:32:57 2001
+++ php4/main/php.h Mon Feb 26 10:14:30 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.133 2001/02/26 16:32:57 dbeu Exp $ */
+/* $Id: php.h,v 1.134 2001/02/26 18:14:30 andi Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -54,11 +54,6 @@
#define THREAD_LS
#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"
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.94 php4/sapi/cgi/cgi_main.c:1.95
--- php4/sapi/cgi/cgi_main.c:1.94 Sun Feb 25 22:07:36 2001
+++ php4/sapi/cgi/cgi_main.c Mon Feb 26 10:14:30 2001
@@ -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"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
