back out changes for the new cygwin cross-compiler that were mistakenly included

[privoxy.git] / w32log.c

diff --git a/w32log.c b/w32log.c
index 19c94b7..77e1622 100644 (file)
--- a/w32log.c
+++ b/w32log.c
@@ -1,4 +1,4 @@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.50 2016/07/23 17:23:43 ler762 Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.51 2016/07/23 23:25:18 ler762 Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.c,v $
@@ -41,7 +41,6 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.50 2016/07/23 17:23:43 ler762 Exp $
 #ifndef STRICT
 #define STRICT
 #endif
-#include <winsock2.h>    /* i686-w64-mingw32-gcc compiler warning if winsock2.h is included after windows.h */
 #include <windows.h>
 #include <richedit.h>
 
@@ -57,6 +56,11 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.50 2016/07/23 17:23:43 ler762 Exp $
 
 const char w32res_h_rcs[] = W32RES_H_VERSION;
 
+#ifdef __MINGW32__
+#include "cygwin.h"
+const char cygwin_h_rcs[] = CYGWIN_H_VERSION;
+#endif
+
 const char w32log_h_rcs[] = W32LOG_H_VERSION;
 
 #ifndef _WIN_CONSOLE /* entire file */