[GNUnet-SVN] r9422 - gnunet/src/util

[gnunet]

Author: durner
Date: 2009-11-08 12:34:18 -0700 (Sun, 08 Nov 2009)
New Revision: 9422

Modified:
   gnunet/src/util/Makefile.am
   gnunet/src/util/scheduler.c
   gnunet/src/util/win.cc
Log:
fix MinGW

Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2009-11-08 17:36:54 UTC (rev 9421)
+++ gnunet/src/util/Makefile.am 2009-11-08 19:34:18 UTC (rev 9422)
@@ -3,17 +3,17 @@
 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

Modified: gnunet/src/util/scheduler.c
===================================================================
--- gnunet/src/util/scheduler.c 2009-11-08 17:36:54 UTC (rev 9421)
+++ gnunet/src/util/scheduler.c 2009-11-08 19:34:18 UTC (rev 9422)
@@ -521,9 +521,7 @@
   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 ();

Modified: gnunet/src/util/win.cc
===================================================================
--- gnunet/src/util/win.cc      2009-11-08 17:36:54 UTC (rev 9421)
+++ gnunet/src/util/win.cc      2009-11-08 19:34:18 UTC (rev 9422)
@@ -42,21 +42,8 @@
 
 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
  */