Move main.h to php_main.h.

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4f51cc5d2109b5c7e9639cf6a131e5f4838dc743..ee38b43c9d386497e2b005fd6d01fe2b05fde85a 100644 (file)
--- 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 785c91e70749ac9da06ca8ed896f7cea3db7cf12..72c457a21937ae98a14cde0f1c20130f2a9375dd 100644 (file)
--- 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 1ddea7437ae32e23ac2c8113718e9394cf078a0e..5ac434ea1872dc72248b4b99a5bf30cb36e965d0 100644 (file)
--- 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 f6d1bbc3ee5535690c1c0c9c5bd42ea91324e89c..a1144e0aac0dcad17aa0a1c4c93b5ceec9cb0ce1 100644 (file)
--- 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 ee98cb1a7bdec144de0a51edf54f5b572038a99c..b596916bbc926c5132deb2071ce65c0d74db5e65 100644 (file)
--- 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 6c578dfd38db93fa41b46f7c0d8919b0681cb0d1..6effcda8e9b24d38076687c006f8fe3c22333636 100644 (file)
--- 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 e4346eceb26f715ce3fabe3786115f296b58cc55..ab21ee77f8c2ce0cf4a2373d9b5899efb0d903da 100644 (file)
--- 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 cc83720f49949f17f89d3f6443f93fcf245a2ab3..6db64b5fa44d05b9915b328cd52e92d795e17fa7 100644 (file)
--- 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 9230f736f1ef0829d715b32437dbf53ad6b2a9d6..72d9008f13daff913fcee671d3afabd9a117a964 100644 (file)
--- 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 4197abf5805f67ef36b3e5d5d72c46852afa8194..9cd4084caaaa4e8a260702e915b6bd0a5ced8f9e 100644 (file)
--- 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 80e6367e73c5182f0154bdca1532e1e7ddfef0e7..799656bf908cb825f2d823f6879e0a12f81434e5 100644 (file)
--- 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 7472bc8ea4ee9f5aa9d2d5e6ef6e619223018a96..ee3fb977e615afdb1912c59b1599fe33e8ac4e20 100644 (file)
--- 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 eacecb4ae175bcea4c8c81daa743f9201c35448f..8922e85834375174d76f07aef778bbb09971738c 100644 (file)
--- 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 7597dec1708eade4e77fe44a11caca5d3ef6b64a..4692db29ae43a9fc8ebc5724542de56e3c10b591 100644 (file)
--- 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"