From: Sascha Schumann <sas@php.net>
Date: Mon, 5 Jun 2000 23:24:42 +0000 (+0000)
Subject: Move main.h to php_main.h.
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=102c6ce4b89c4efd46eb8c2b212943c188312938;p=php

Move main.h to php_main.h.
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4f51cc5d21..ee38b43c9d 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -19,7 +19,7 @@
 
 
 #include "php.h"
-#include "main.h"
+#include "php_main.h"
 #include "php_ini.h"
 #include "internal_functions_registry.h"
 #include "php_standard.h"
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 785c91e707..72c457a219 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -21,7 +21,7 @@
 #include "php.h"
 #include "ext/standard/php_standard.h"
 #include "SAPI.h"
-#include "main.h"
+#include "php_main.h"
 #include "head.h"
 #include "SAPI.h"
 #ifdef TM_IN_SYS_TIME
diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 1ddea7437a..5ac434ea18 100644
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -21,7 +21,7 @@
 /* $Id$ */
 
 #include "php.h"
-#include "main.h"
+#include "php_main.h"
 #include "modules.h"
 #include "internal_functions_registry.h"
 #include "zend_compile.h"
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index f6d1bbc3ee..a1144e0aac 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -22,7 +22,7 @@
 
 
 #include "php.h"
-#include "main.h"
+#include "php_main.h"
 #include "modules.h"
 #include "internal_functions_registry.h"
 #include "zend_compile.h"
diff --git a/main/main.c b/main/main.c
index ee98cb1a7b..b596916bbc 100644
--- a/main/main.c
+++ b/main/main.c
@@ -46,7 +46,7 @@
 #include "zend.h"
 #include "php_ini.h"
 #include "php_globals.h"
-#include "main.h"
+#include "php_main.h"
 #include "fopen-wrappers.h"
 #include "ext/standard/php_standard.h"
 #include "php_variables.h"
diff --git a/main.h b/main/php_main.h
similarity index 100%
rename from main.h
rename to main/php_main.h
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 6c578dfd38..6effcda8e9 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -43,7 +43,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "SAPI.h"
-#include "main.h"
+#include "php_main.h"
 
 #include "ns.h"
 
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index e4346eceb2..ab21ee77f8 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -48,7 +48,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "SAPI.h"
-#include "main.h"
+#include "php_main.h"
 
 #include "zend_compile.h"
 #include "zend_execute.h"
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index cc83720f49..6db64b5fa4 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -48,7 +48,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "SAPI.h"
-#include "main.h"
+#include "php_main.h"
 #include "zend_compile.h"
 #include "zend_execute.h"
 #include "zend_highlight.h"
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 9230f736f1..72d9008f13 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -50,7 +50,7 @@
 #include "zend_extensions.h"
 #include "php_ini.h"
 #include "php_globals.h"
-#include "main.h"
+#include "php_main.h"
 #include "fopen-wrappers.h"
 #include "ext/standard/php_standard.h"
 #ifdef PHP_WIN32
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 4197abf580..9cd4084caa 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -32,7 +32,7 @@
 #include <httpfilt.h>
 #include <httpext.h>
 #include "php.h"
-#include "main.h"
+#include "php_main.h"
 #include "SAPI.h"
 #include "php_globals.h"
 #include "ext/standard/info.h"
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 80e6367e73..799656bf90 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -27,7 +27,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "SAPI.h"
-#include "main.h"
+#include "php_main.h"
 #include "php_version.h"
 #include "TSRM.h"
 #include "ext/standard/php_standard.h"
diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index 7472bc8ea4..ee3fb977e6 100644
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -19,7 +19,7 @@
 
 #include "php.h"
 #include "SAPI.h"
-#include "main.h"
+#include "php_main.h"
 
 #ifdef HAVE_PHTTPD
 
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index eacecb4ae1..8922e85834 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -48,7 +48,7 @@
 #include "zend.h"
 #include "php_ini.h"
 #include "php_globals.h"
-#include "main.h"
+#include "php_main.h"
 #include "fopen-wrappers.h"
 #include "ext/standard/php_standard.h"
 #include "ext/standard/php_dir.h"
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 7597dec170..4692db29ae 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -19,7 +19,7 @@
 
 #include "php.h"
 #include "SAPI.h"
-#include "main.h"
+#include "php_main.h"
 #include "php_thttpd.h"
 #include "version.h"