Fix checks for Cygwin-related macros.

The search-and-replace done in commit 0466160 broke compilation on Cygwin.

Closes #198 on GitHub.

diff --git a/src/getopt.c b/src/getopt.c
index 1f6c27b5366a844cf289c0148fd34249770e4f76..741c7f2b01f84d25860a2384facc998013b574db 100644 (file)
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -83,7 +83,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 #endif
 
-#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()

diff --git a/src/net_setup.c b/src/net_setup.c
index 8c43b3960902d99c58db7e6421f3ea0de79e8141..cac7455d3a16f44add273ac4d41d2cc53963e0f8 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -239,7 +239,7 @@ static bool read_rsa_private_key(void) {
                return false;
        }
 
-#if !defined(HAVE_MINGW) && !defined(HAVE___CYGWIN32__)
+#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
        struct stat s;
 
        if(!fstat(fileno(fp), &s)) {
@@ -860,7 +860,7 @@ static bool setup_myself(void) {
 #ifdef HAVE_MINGW
        Sleep(1000);
 #endif
-#ifdef HAVE___CYGWIN32__
+#ifdef HAVE_CYGWIN
        sleep(1);
 #endif
        execute_script("tinc-up", envp);

diff --git a/src/utils.c b/src/utils.c
index 28f60e877ad921bc5fd202e6f427887675f055fc..70a5c99d70c52532a188a6ac7fdb6ebb239129bc 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -54,8 +54,8 @@ void bin2hex(char *src, char *dst, int length) {
        }
 }
 
-#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
 

diff --git a/src/utils.h b/src/utils.h
index fbeae5eb9ae9553f0e7a508dc377b27c5cd5dd48..79520250899fabb3b5d883327396107338128fdb 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -24,8 +24,11 @@
 extern bool hex2bin(char *src, char *dst, int length);
 extern void bin2hex(char *src, char *dst, int length);
 
-#ifdef HAVE_MINGW
+#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
 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)