[GNUnet-SVN] r13239 - in gnunet/src: include util

[gnunet]

Author: durner
Date: 2010-10-08 17:58:28 +0200 (Fri, 08 Oct 2010)
New Revision: 13239

Modified:
   gnunet/src/include/winproc.h
   gnunet/src/util/common_logging.c
   gnunet/src/util/os_load.c
   gnunet/src/util/winproc.c
Log:
fix warning

Modified: gnunet/src/include/winproc.h
===================================================================
--- gnunet/src/include/winproc.h        2010-10-08 15:48:01 UTC (rev 13238)
+++ gnunet/src/include/winproc.h        2010-10-08 15:58:28 UTC (rev 13239)
@@ -205,7 +205,7 @@
                             DWORD dwAccessMask);
   char *winErrorStr (const char *prefix, int dwErr);
 
-  void GNInitWinEnv ();
+  int GNInitWinEnv ();
   void GNShutdownWinEnv ();
 
 #ifdef __cplusplus

Modified: gnunet/src/util/common_logging.c
===================================================================
--- gnunet/src/util/common_logging.c    2010-10-08 15:48:01 UTC (rev 13238)
+++ gnunet/src/util/common_logging.c    2010-10-08 15:58:28 UTC (rev 13239)
@@ -591,7 +591,7 @@
 {
   GNUNET_stderr = stderr;
 #ifdef MINGW
-  InitWinEnv (NULL);
+  GNInitWinEnv (NULL);
 #endif
 }
 
@@ -602,7 +602,7 @@
 void __attribute__ ((destructor)) GNUNET_util_cl_fini ()
 {
 #ifdef MINGW
-  ShutdownWinEnv ();
+  GNShutdownWinEnv ();
 #endif
 }
 

Modified: gnunet/src/util/os_load.c
===================================================================
--- gnunet/src/util/os_load.c   2010-10-08 15:48:01 UTC (rev 13238)
+++ gnunet/src/util/os_load.c   2010-10-08 15:58:28 UTC (rev 13239)
@@ -655,7 +655,7 @@
   initMachCpuStats ();
   updateUsage ();               /* initialize */
 #elif MINGW
-  InitWinEnv (NULL);
+  GNInitWinEnv (NULL);
   updateUsage ();               /* initialize */
 #else
   updateUsage ();               /* initialize */
@@ -676,7 +676,7 @@
 #elif defined(DARWIN)
   GNUNET_free_non_null (prev_cpu_load);
 #elif MINGW
-  ShutdownWinEnv ();
+  GNShutdownWinEnv ();
 #endif
 }
 

Modified: gnunet/src/util/winproc.c
===================================================================
--- gnunet/src/util/winproc.c   2010-10-08 15:48:01 UTC (rev 13238)
+++ gnunet/src/util/winproc.c   2010-10-08 15:58:28 UTC (rev 13239)
@@ -83,7 +83,7 @@
  * @return Error code from winerror.h, ERROR_SUCCESS on success
 */
 int
-InitWinEnv ()
+GNInitWinEnv ()
 {
   int ret;
 
@@ -231,7 +231,7 @@
  * Clean up Windows environment
  */
 void
-ShutdownWinEnv ()
+GNShutdownWinEnv ()
 {
   plibc_shutdown ();