getopt.h conflicted with system include file

diff --git a/cgi_main.c b/cgi_main.c
index 26e15898febeb60686fa5204f73021bf913f841f..15fc418da5a65b4f9f962987a81008a1569863bc 100644 (file)
--- a/cgi_main.c
+++ b/cgi_main.c
@@ -57,7 +57,7 @@ struct sapi_request_info *sapi_rqst;
 #endif
 
 #if MSVC5 || !defined(HAVE_GETOPT)
-#include "getopt.h"
+#include "php_getopt.h"
 #endif
 
 PHPAPI extern char *php3_ini_path;

diff --git a/getopt.c b/getopt.c
index 1662cf1677e48483235f76bfa8d9ad2ed3074d7e..3b431f4408d189f1a3f491c82972a16c17fbc2e7 100644 (file)
--- a/getopt.c
+++ b/getopt.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "getopt.h"
+#include "php_getopt.h"
 #define OPTERRCOLON (1)
 #define OPTERRNF (2)
 #define OPTERRARG (3)

diff --git a/main/main.c b/main/main.c
index 59a299ef67f3b4d94a10b1a6d8af2956fc185766..494897b668f15925faa08541cce1f9faad90e0cc 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -86,7 +86,7 @@ struct sapi_request_info *sapi_rqst;
 #include "SAPI.h"
 
 #if MSVC5 || !defined(HAVE_GETOPT)
-#include "getopt.h"
+#include "php_getopt.h"
 #endif
 
 

diff --git a/getopt.h b/php_getopt.h
similarity index 100%
rename from getopt.h
rename to php_getopt.h