#endif
#ifdef HAVE_CONFIG_H
-#include <../src/config.h>
+#include <config.h>
#endif
#include <stdio.h>
#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
#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)
{