jani Mon Jul 16 13:41:12 2007 UTC
Removed files:
/php-src/ext/ereg/regex regex_extra.h
Modified files:
/php-src/ext/ereg config0.m4 php_regex.h
/php-src/ext/ereg/regex utils.h
/php-src/sapi/apache php_apache_http.h
/php-src/sapi/apache_hooks php_apache_http.h
Log:
- Cleanup and simplify
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/config0.m4?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/ereg/config0.m4
diff -u php-src/ext/ereg/config0.m4:1.1 php-src/ext/ereg/config0.m4:1.2
--- php-src/ext/ereg/config0.m4:1.1 Sun Jul 15 19:50:06 2007
+++ php-src/ext/ereg/config0.m4 Mon Jul 16 13:41:12 2007
@@ -1,11 +1,11 @@
-dnl $Id: config0.m4,v 1.1 2007/07/15 19:50:06 jani Exp $
+dnl $Id: config0.m4,v 1.2 2007/07/16 13:41:12 jani Exp $
dnl config.m4 for extension ereg
dnl
dnl Check for regex library type
dnl
PHP_ARG_WITH(regex,,
-[ --with-regex=TYPE regex library type: system, apache, php. [TYPE=php]
+[ --with-regex=TYPE regex library type: system, php. [TYPE=php]
WARNING: Do NOT use unless you know what you are
doing!], php, no)
case $PHP_REGEX in
@@ -16,9 +16,6 @@
REGEX_TYPE=system
fi
;;
- apache)
- REGEX_TYPE=apache
- ;;
yes | php)
REGEX_TYPE=php
;;
@@ -34,9 +31,10 @@
if test "$REGEX_TYPE" = "php"; then
ereg_regex_sources="regex/regcomp.c regex/regexec.c regex/regerror.c
regex/regfree.c"
ereg_regex_headers="regex/"
+ PHP_EREG_CFLAGS="-Dregexec=php_regexec -Dregerror=php_regerror
-Dregfree=php_regfree -Dregcomp=php_regcomp"
fi
-PHP_NEW_EXTENSION(ereg, ereg.c $ereg_regex_sources, no)
+PHP_NEW_EXTENSION(ereg, ereg.c $ereg_regex_sources, no,,$PHP_EREG_CFLAGS)
PHP_INSTALL_HEADERS([ext/ereg], [php_ereg.h php_regex.h $ereg_regex_headers])
if test "$REGEX_TYPE" = "php"; then
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/php_regex.h?r1=1.19&r2=1.20&diff_format=u
Index: php-src/ext/ereg/php_regex.h
diff -u php-src/ext/ereg/php_regex.h:1.19 php-src/ext/ereg/php_regex.h:1.20
--- php-src/ext/ereg/php_regex.h:1.19 Sun Jul 15 19:50:06 2007
+++ php-src/ext/ereg/php_regex.h Mon Jul 16 13:41:12 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_regex.h,v 1.19 2007/07/15 19:50:06 jani Exp $ */
+/* $Id: php_regex.h,v 1.20 2007/07/16 13:41:12 jani Exp $ */
#ifndef PHP_REGEX_H
#define PHP_REGEX_H
@@ -27,15 +27,14 @@
* 1.. bundled regex
*/
-#if REGEX
-/* get aliases */
-#include "ext/ereg/regex/regex_extra.h"
-#include "ext/ereg/regex/regex.h"
+#if (REGEX == 1)
+/* Define aliases */
+#define regexec php_regexec
+#define regerror php_regerror
+#define regfree php_regfree
+#define regcomp php_regcomp
-/* get rid of aliases */
-#define PHP_NO_ALIASES
-#include "ext/ereg/regex/regex_extra.h"
-#undef PHP_NO_ALIASES
+#include "ext/ereg/regex/regex.h"
#undef _PCREPOSIX_H
#define _PCREPOSIX_H 1
@@ -55,6 +54,7 @@
#ifndef _H_REGEX
#define _H_REGEX 1 /* This one is for AIX */
#endif
+
#elif REGEX == 0
#include <regex.h>
#ifndef _REGEX_H_
@@ -63,8 +63,3 @@
#endif
#endif /* PHP_REGEX_H */
-
-/* No frame, regex_extra.h must be included always */
-#if (REGEX == 1 || REGEX == 0) && !defined(NO_REGEX_EXTRA_H)
-#include "ext/ereg/regex/regex_extra.h"
-#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/utils.h?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/ereg/regex/utils.h
diff -u php-src/ext/ereg/regex/utils.h:1.3 php-src/ext/ereg/regex/utils.h:1.4
--- php-src/ext/ereg/regex/utils.h:1.3 Sat Nov 13 16:51:32 1999
+++ php-src/ext/ereg/regex/utils.h Mon Jul 16 13:41:12 2007
@@ -1,7 +1,5 @@
/* utility definitions */
-#include "regex_extra.h"
-
#ifdef _POSIX2_RE_DUP_MAX
#define DUPMAX _POSIX2_RE_DUP_MAX
#else
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache_http.h?r1=1.17&r2=1.18&diff_format=u
Index: php-src/sapi/apache/php_apache_http.h
diff -u php-src/sapi/apache/php_apache_http.h:1.17
php-src/sapi/apache/php_apache_http.h:1.18
--- php-src/sapi/apache/php_apache_http.h:1.17 Sun Jul 15 19:50:07 2007
+++ php-src/sapi/apache/php_apache_http.h Mon Jul 16 13:41:12 2007
@@ -18,9 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache_http.h,v 1.17 2007/07/15 19:50:07 jani Exp $ */
-
-#define NO_REGEX_EXTRA_H
+/* $Id: php_apache_http.h,v 1.18 2007/07/16 13:41:12 jani Exp $ */
#ifdef WIN32
#include <stddef.h>
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache_http.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache_http.h
diff -u php-src/sapi/apache_hooks/php_apache_http.h:1.4
php-src/sapi/apache_hooks/php_apache_http.h:1.5
--- php-src/sapi/apache_hooks/php_apache_http.h:1.4 Sun Jul 15 19:50:07 2007
+++ php-src/sapi/apache_hooks/php_apache_http.h Mon Jul 16 13:41:12 2007
@@ -1,4 +1,3 @@
-#define NO_REGEX_EXTRA_H
#ifdef WIN32
#include <winsock2.h>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
