The search-and-replace done in commit
0466160 broke compilation on Cygwin.
Closes #198 on GitHub.
-#if defined (WIN32) && !defined (__CYGWIN32__32)
+#if defined (WIN32) && !defined (__CYGWIN32__)
/* It's not Unix, really. See? Capital letters. */
#include <windows.h>
#define getpid() GetCurrentProcessId()
/* It's not Unix, really. See? Capital letters. */
#include <windows.h>
#define getpid() GetCurrentProcessId()
-#if !defined(HAVE_MINGW) && !defined(HAVE___CYGWIN32__)
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
struct stat s;
if(!fstat(fileno(fp), &s)) {
struct stat s;
if(!fstat(fileno(fp), &s)) {
#ifdef HAVE_MINGW
Sleep(1000);
#endif
#ifdef HAVE_MINGW
Sleep(1000);
#endif
-#ifdef HAVE___CYGWIN32__
sleep(1);
#endif
execute_script("tinc-up", envp);
sleep(1);
#endif
execute_script("tinc-up", envp);
-#if defined(HAVE_MINGW) || defined(HAVE___CYGWIN32__)
-#ifdef HAVE___CYGWIN32__
+#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+#ifdef HAVE_CYGWIN
#include <w32api/windows.h>
#endif
#include <w32api/windows.h>
#endif
extern bool hex2bin(char *src, char *dst, int length);
extern void bin2hex(char *src, char *dst, int length);
extern bool hex2bin(char *src, char *dst, int length);
extern void bin2hex(char *src, char *dst, int length);
+#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
extern const char *winerror(int);
extern const char *winerror(int);
+#endif
+
+#ifdef HAVE_MINGW
#define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
#define sockerrno WSAGetLastError()
#define sockstrerror(x) winerror(x)
#define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
#define sockerrno WSAGetLastError()
#define sockstrerror(x) winerror(x)