summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.h
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-08-25 16:09:23 +0000
committerZeev Suraski <zeev@php.net>2001-08-25 16:09:23 +0000
commitb8763a6f8c4de609df0a086b10da617eed56578b (patch)
tree7a48eaad655e607dce434dcbb33a3c59814c3c06 /ext/standard/basic_functions.h
parent13ff183225ef9159a33b8489cbaab9685e4820da (diff)
downloadphp-git-b8763a6f8c4de609df0a086b10da617eed56578b.tar.gz
Get rid of TRANS_SID - it's always possible to use it now.
Diffstat (limited to 'ext/standard/basic_functions.h')
-rw-r--r--ext/standard/basic_functions.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 6001628b66..e31eb230fd 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -26,10 +26,8 @@
#include "zend_highlight.h"
-#ifdef TRANS_SID
-# include "url_scanner.h"
-# include "url_scanner_ex.h"
-#endif
+#include "url_scanner.h"
+#include "url_scanner_ex.h"
extern zend_module_entry basic_functions_module;
#define basic_functions_module_ptr &basic_functions_module
@@ -183,12 +181,10 @@ typedef struct {
zend_class_entry *incomplete_class;
zend_bool use_trans_sid;
-#ifdef TRANS_SID
/* url_scanner.c */
url_adapt_state_t url_adapt_state;
/* url_scanner_ex.re */
url_adapt_state_ex_t url_adapt_state_ex;
-#endif
#ifdef HAVE_MMAP
void *mmap_file;