Mercurial > hg > xemacs-beta

diff lib-src/getopt.c @ 412:697ef44129c6 r21-2-14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-14
author cvs
date Mon, 13 Aug 2007 11:20:41 +0200
parents de805c49cfc1
children
line wrap: on
line diff
--- a/lib-src/getopt.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/lib-src/getopt.c	Mon Aug 13 11:20:41 2007 +0200
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <../src/config.h>
 #endif
 
 #include <stdio.h>
@@ -73,7 +73,7 @@
 #endif
 #endif
 
-#if defined (WIN32_NATIVE) && !defined (CYGWIN)
+#if defined (WIN32) && !defined (__CYGWIN32__)
 /* It's not Unix, really.  See?  Capital letters.  */
 #include <windows.h>
 #undef getpid
@@ -202,6 +202,11 @@
 #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)
 {