Remove APACHE symbol

The APACHE symbol was used in very early PHP versions to indicate the
Apache module usage. Since PHP 4 this is no longer used in the code.

diff --git a/configure.ac b/configure.ac
index 9ca763b2713325f3e1bd6fff0b8d178a5cfaf6db..4ebb320c3d4d589f0e515d63ea6ae63e6d32e8eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1612,9 +1612,6 @@ test -d Zend || $php_shtool mkdir Zend
 
 cat >Zend/zend_config.h <<FEO
 #include <../main/php_config.h>
-#if defined(APACHE) && defined(PHP_API_VERSION)
-#undef HAVE_DLFCN_H
-#endif
 FEO
 
 dnl Run this only when generating all the files.

diff --git a/ext/standard/url.c b/ext/standard/url.c
index ff70ea4e04585403590188ce2b987793a29dc5ab..a04d94149812b8a1a5814660c715c6147224814a 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -26,14 +26,10 @@
 #include "url.h"
 #include "file.h"
 #ifdef _OSD_POSIX
-#ifndef APACHE
-#error On this EBCDIC platform, PHP is only supported as an Apache module.
-#else /*APACHE*/
-#ifndef CHARSET_EBCDIC
-#define CHARSET_EBCDIC /* this machine uses EBCDIC, not ASCII! */
-#endif
-#include "ebcdic.h"
-#endif /*APACHE*/
+# ifndef CHARSET_EBCDIC
+#  define CHARSET_EBCDIC /* this machine uses EBCDIC, not ASCII! */
+# endif
+# include "ebcdic.h"
 #endif /*_OSD_POSIX*/
 
 /* {{{ free_url

diff --git a/main/php.h b/main/php.h
index ae5d38bdd23d87a27171c5de6a80e85afda7b032..480da6fb18d0912af78d0c229820112dc293a1e2 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -128,8 +128,6 @@ typedef int pid_t;
 #endif
 #include <assert.h>
 
-#define APACHE 0
-
 #if HAVE_UNIX_H
 #include <unix.h>
 #endif