From 681031a5fb3b1081675033d27cff491517173374 Mon Sep 17 00:00:00 2001
From: Nils Durner <durner@gnunet.org>
Date: Sun, 8 Nov 2009 19:34:18 +0000
Subject: [PATCH] fix MinGW

---
 src/util/Makefile.am | 14 +++++++-------
 src/util/scheduler.c |  2 --
 src/util/win.cc      | 13 -------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 822ed19a6..b616de4d1 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/src/include
 plugindir = $(libdir)/gnunet
 
 if MINGW
-noinst_LIBRARIES = \
-  libgnunetutilwin.a
-libgnunetutilwin_a_SOURCES = \
+noinst_LTLIBRARIES = \
+  libgnunetutilwin.la
+libgnunetutilwin_la_SOURCES = \
   win.cc \
   winproc.c
-libgnunetutilwin_a_LDFLAGS = \
+libgnunetutilwin_la_LDFLAGS = \
   -Wl,--no-undefined -Wl,--export-all-symbols 
-libgnunetutilwin_a_LIBADD = \
-  -lole32 -lshell32 -luuid -liconv -lstdc++ \
+libgnunetutilwin_la_LIBADD = \
+  -lshell32 -luuid -liconv -lstdc++ \
   -lcomdlg32 -lgdi32
-WINLIB = libgnunetutilwin.a
+WINLIB = libgnunetutilwin.la
 endif
 
 if USE_COVERAGE
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index dc428e592..ba4c8dbcf 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -521,9 +521,7 @@ GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_Task task, void *task_cls)
   struct GNUNET_SIGNAL_Context *shc_hup;
   unsigned long long last_tr;
   unsigned int busy_wait_warning;
-#ifndef MINGW
   const struct GNUNET_DISK_FileHandle *pr;
-#endif
   char c;
 
   rs = GNUNET_NETWORK_fdset_create ();
diff --git a/src/util/win.cc b/src/util/win.cc
index df5f686b3..2cc3b8f71 100644
--- a/src/util/win.cc
+++ b/src/util/win.cc
@@ -42,21 +42,8 @@ using namespace std;
 
 extern "C" {
 
-typedef list<WSAOVERLAPPED *> TOLList;
-
-static HANDLE hOLLock;
-static TOLList lstOL;
-
 int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);
 
-void __attribute__ ((constructor)) gnunet_win_init() {
-  hOLLock = CreateMutex(NULL, FALSE, NULL);
-}
-
-void __attribute__ ((destructor)) gnunet_win_fini() {
-  CloseHandle(hOLLock);
-}
-
 /**
  * Enumerate all network adapters
  */
-- 
2.25.1