The search-and-replace done in commit 0466160 broke compilation on Cygwin. Closes #198 on GitHub.
@@ -83,7 +83,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#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()
@@ -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);
-#ifdef HAVE___CYGWIN32__
+#ifdef HAVE_CYGWIN
sleep(1);
execute_script("tinc-up", envp);
@@ -54,8 +54,8 @@ void bin2hex(char *src, char *dst, int length) {
-#if defined(HAVE_MINGW) || defined(HAVE___CYGWIN32__)
+#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
#include <w32api/windows.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
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)