X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lib-src%2Fgetopt.c;h=51d69cf3de7b667d99bdb5dc9a00bfe644034e50;hb=870ce425d7fce5b9ca91edc7e39c12e8f5df8705;hp=dd5cc7121a589c7db5cfd32efb3ab20654d34219;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index dd5cc71..51d69cf 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -31,7 +31,7 @@ USA.  */
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <../src/config.h>
+#include <config.h>
 #endif
 
 #include <stdio.h>
@@ -73,7 +73,7 @@ USA.  */
 #endif
 #endif
 
-#if defined (WIN32) && !defined (__CYGWIN32__)
+#if defined (WIN32_NATIVE) && !defined (CYGWIN)
 /* It's not Unix, really.  See?  Capital letters.  */
 #include <windows.h>
 #undef getpid
@@ -202,11 +202,6 @@ static char *posixly_correct;
 #define	my_index	strchr
 #else
 
-/* Avoid depending on library functions or files
-   whose names are inconsistent.  */
-
-char *getenv ();
-
 static char *
 my_index (const char *str, int chr)
 {