fix MinGW

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 822ed19a64d012cd5acaff9ed9ceabc59f7150a3..b616de4d18662897f4a64300afd5b73b175d034f 100644 (file)
--- 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 dc428e592e95b8ab333d94fa6d4a61d2b821ec2f..ba4c8dbcf3f6995d4e798235a795ec691b6950b0 100644 (file)
--- 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 df5f686b36a4f20a6857d712312faed59802f86c..2cc3b8f716ca272a5fb843b80e812f66ebe0b627 100644 (file)
--- a/src/util/win.cc
+++ b/src/util/win.cc
@@ -42,21 +42,8 @@ using namespace std;
 \r
 extern "C" {\r
 \r
-typedef list<WSAOVERLAPPED *> TOLList;\r
-\r
-static HANDLE hOLLock;\r
-static TOLList lstOL;\r
-\r
 int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);\r
 \r
-void __attribute__ ((constructor)) gnunet_win_init() {\r
-  hOLLock = CreateMutex(NULL, FALSE, NULL);\r
-}\r
-\r
-void __attribute__ ((destructor)) gnunet_win_fini() {\r
-  CloseHandle(hOLLock);\r
-}\r
-\r
 /**\r
  * Enumerate all network adapters\r
  */\r