[GNUnet-SVN] r1592 - in GNUnet/src/util: . win

[durner]

Author: durner
Date: 2005-07-30 12:17:06 -0700 (Sat, 30 Jul 2005)
New Revision: 1592

Modified:
   GNUnet/src/util/Makefile.am
   GNUnet/src/util/initialize.c
   GNUnet/src/util/win/winproc.c
Log:
Fix MinGW

Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2005-07-30 01:10:17 UTC (rev 1591)
+++ GNUnet/src/util/Makefile.am 2005-07-30 19:17:06 UTC (rev 1592)
@@ -16,6 +16,8 @@
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 
-luuid -lstdc++ -lcomdlg32 -lgdi32
  WINSUBDIRS = win
  WINLIBADD = $(top_builddir)/src/util/win/libwin.la 
+else
+ DLFLAG = -ldl
 endif
 
 if CYGWIN
@@ -35,7 +37,7 @@
   check.conf
 
 libgnunetutil_la_LDFLAGS = \
- -export-dynamic $(LIBLTDL) $(LIBGCRYPT_LIBS) $(SOLFLAGS) $(WINFLAGS) $(LIBS) 
-lgmp -ldl \
+ -export-dynamic $(LIBLTDL) $(LIBGCRYPT_LIBS) $(SOLFLAGS) $(WINFLAGS) $(LIBS) 
-lgmp $(DLFLAG) \
  -version-info 1:0:0
 
 generate_gnunetd_conf.c: generate

Modified: GNUnet/src/util/initialize.c
===================================================================
--- GNUnet/src/util/initialize.c        2005-07-30 01:10:17 UTC (rev 1591)
+++ GNUnet/src/util/initialize.c        2005-07-30 19:17:06 UTC (rev 1592)
@@ -109,7 +109,8 @@
             CommandLineParser parser) {
 
 #ifdef MINGW
-  InitWinEnv();
+  if (InitWinEnv() != ERROR_SUCCESS)
+       return SYSERR;
 #endif
 #if ENABLE_NLS
   setlocale (LC_ALL, "");

Modified: GNUnet/src/util/win/winproc.c
===================================================================
--- GNUnet/src/util/win/winproc.c       2005-07-30 01:10:17 UTC (rev 1591)
+++ GNUnet/src/util/win/winproc.c       2005-07-30 19:17:06 UTC (rev 1592)
@@ -76,9 +76,11 @@
  * Initialize PlibC and set up Windows environment
  * @return Error code from winerror.h, ERROR_SUCCESS on success
 */
-void InitWinEnv()
+int InitWinEnv()
 {
-       plibc_init("GNU", PACKAGE);
+       int ret;
+       
+       ret = plibc_init("GNU", PACKAGE);
        plibc_set_panic_proc(plibc_panic);
 
   hNTDLL = LoadLibrary("ntdll.dll");
@@ -215,6 +217,8 @@
        GNNetUserAdd = NULL;
        GNNetUserSetInfo = NULL;
   }
+  
+  return ret;
 }
 
 /**