summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-05-11 00:01:47 +0000
committerZeev Suraski <zeev@php.net>1999-05-11 00:01:47 +0000
commit0b77132507dad64295a1521f9d4abfc5fbb747c9 (patch)
tree57f46ebcb35676eadbd260a9a1d368220a557e54 /main/php.h
parent957616cd2d9fa3bf1e1409fe9a18e9b33835ef10 (diff)
downloadphp-git-0b77132507dad64295a1521f9d4abfc5fbb747c9.tar.gz
* Get Apache to work. POST doesn't work yet.
* There are now -I directives for the absolute path of php4, php4/libzend and the builddir for the Apache module, so we can #include any php/Zend header. * Rename config.h to php_config.h
Diffstat (limited to 'main/php.h')
-rw-r--r--main/php.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/main/php.h b/main/php.h
index f40528ea00..e7df9ae5ad 100644
--- a/main/php.h
+++ b/main/php.h
@@ -75,7 +75,7 @@ extern unsigned char second_arg_allow_ref[];
# define PHPAPI __declspec(dllimport)
# endif
#else
-#include "config.h"
+#include "php_config.h"
#define PHPAPI
#define THREAD_LS
#endif
@@ -151,16 +151,6 @@ typedef zval pval;
#define pval_copy_constructor zval_copy_ctor
#define pval_destructor zval_dtor
-#if REGEX
-#include "regex/regex.h"
-#define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */
-#define _RX_H 1 /* Try defining these for Linux to */
-#define __REGEXP_LIBRARY_H__ 1 /* avoid Apache including regex.h */
-#define _H_REGEX 1 /* This one is for AIX */
-#else
-#include <regex.h>
-#endif
-
#if STDC_HEADERS
# include <string.h>
#else