diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-07-08 15:05:54 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-08 15:05:54 +0200 |
| commit | 4b864c2ebbee11739a52b20a59aff8bdf9a38801 (patch) | |
| tree | 6fff32972d930ba0efbe03867949a5899b9c46f8 | |
| parent | 900de30b0f40a254e19082d3e2b696d58e338b43 (diff) | |
| download | php-git-4b864c2ebbee11739a52b20a59aff8bdf9a38801.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | ext/standard/url.c | 12 | ||||
| -rw-r--r-- | main/php.h | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 9ca763b271..4ebb320c3d 100644 --- 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 ff70ea4e04..a04d941498 100644 --- 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 ae5d38bdd2..480da6fb18 100644 --- 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 |