From: Sascha Schumann <sas@php.net>
Date: Sat, 29 May 1999 13:53:59 +0000 (+0000)
Subject: getopt.h conflicted with system include file
X-Git-Tag: BEFORE_REMOVING_GC_STEP1~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52463124be82988bf0ba77a978deacdd84d48be7;p=php

getopt.h conflicted with system include file
---

diff --git a/cgi_main.c b/cgi_main.c
index 26e15898fe..15fc418da5 100644
--- 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 1662cf1677..3b431f4408 100644
--- 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 59a299ef67..494897b668 100644
--- 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