- Moved the old regex functions to it's own extension: ereg

4 files changed, 0 insertions, 73 deletions

diff --git a/main/internal_functions_nw.c b/main/internal_functions_nw.c
index c2e06188ac..70802e8edf 100644
--- a/main/internal_functions_nw.c
+++ b/main/internal_functions_nw.c
@@ -51,7 +51,6 @@
 /*#include "ext/com/php_COM.h"
 #include "ext/com/php_VARIANT.h"*/
 #include "ext/ftp/php_ftp.h"
-#include "ext/standard/reg.h"
 #include "ext/pcre/php_pcre.h"
 /*#include "ext/odbc/php_odbc.h"*/	/* Commented out for now */
 #include "ext/session/php_session.h"
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 4c4aca9e6b..691363f698 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -60,7 +60,6 @@
 #if HAVE_FTP
 #include "ext/ftp/php_ftp.h"
 #endif
-#include "ext/standard/reg.h"
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 #include "ext/pcre/php_pcre.h"
 #endif
diff --git a/main/php.h b/main/php.h
index f93a74e9e9..746fa1c815 100644
--- a/main/php.h
+++ b/main/php.h
@@ -71,8 +71,6 @@
 #define PHP_OS      PHP_UNAME
 #endif
 
-#include "php_regex.h"
-
 #if HAVE_ASSERT_H
 #if PHP_DEBUG
 #undef NDEBUG
@@ -193,10 +191,6 @@ typedef zval pval;
 char *strerror(int);
 #endif
 
-#if (REGEX == 1 || REGEX == 0) && !defined(NO_REGEX_EXTRA_H)
-#include "regex/regex_extra.h"
-#endif
-
 #if HAVE_PWD_H
 # ifdef PHP_WIN32
 #include "win32/param.h"
diff --git a/main/php_regex.h b/main/php_regex.h
deleted file mode 100644
index 3537d6ab87..0000000000
--- a/main/php_regex.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-  +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2007 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author:                                                              |
-  +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef PHP_REGEX_H
-#define PHP_REGEX_H
-
-/*
- * REGEX means:
- * 0.. system regex
- * 1.. bundled regex
- */
-
-#if REGEX
-/* get aliases */
-#include "regex/regex_extra.h"
-#include "regex/regex.h"
-
-/* get rid of aliases */
-#define PHP_NO_ALIASES
-#include "regex/regex_extra.h"
-#undef PHP_NO_ALIASES
-
-#undef _PCREPOSIX_H
-#define _PCREPOSIX_H 1
-
-#ifndef _REGEX_H
-#define _REGEX_H 1				/* this should stop Apache from loading the system version of regex.h */
-#endif
-#ifndef _REGEX_H_
-#define _REGEX_H_ 1
-#endif
-#ifndef _RX_H
-#define _RX_H 1				  	/* Try defining these for Linux to	*/
-#endif
-#ifndef __REGEXP_LIBRARY_H__
-#define __REGEXP_LIBRARY_H__ 1 	/* avoid Apache including regex.h	*/
-#endif
-#ifndef _H_REGEX
-#define _H_REGEX 1              /* This one is for AIX */
-#endif
-#elif REGEX == 0
-#include <regex.h>
-#ifndef _REGEX_H_
-#define _REGEX_H_ 1
-#endif
-#endif
-
-#endif /* PHP_REGEX_H */