From: Nils Durner Date: Fri, 8 Oct 2010 15:58:28 +0000 (+0000) Subject: fix warning X-Git-Tag: initial-import-from-subversion-38251~20099 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=84856f94d68830caf56018bb2e17621f9eab2fe2;p=oweals%2Fgnunet.git fix warning --- diff --git a/src/include/winproc.h b/src/include/winproc.h index c036ba965..5dd29df56 100644 --- a/src/include/winproc.h +++ b/src/include/winproc.h @@ -205,7 +205,7 @@ extern "C" DWORD dwAccessMask); char *winErrorStr (const char *prefix, int dwErr); - void GNInitWinEnv (); + int GNInitWinEnv (); void GNShutdownWinEnv (); #ifdef __cplusplus diff --git a/src/util/common_logging.c b/src/util/common_logging.c index e05600986..b17501690 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -591,7 +591,7 @@ void __attribute__ ((constructor)) GNUNET_util_cl_init () { GNUNET_stderr = stderr; #ifdef MINGW - InitWinEnv (NULL); + GNInitWinEnv (NULL); #endif } @@ -602,7 +602,7 @@ void __attribute__ ((constructor)) GNUNET_util_cl_init () void __attribute__ ((destructor)) GNUNET_util_cl_fini () { #ifdef MINGW - ShutdownWinEnv (); + GNShutdownWinEnv (); #endif } diff --git a/src/util/os_load.c b/src/util/os_load.c index e54147ff4..53e9a84c3 100644 --- a/src/util/os_load.c +++ b/src/util/os_load.c @@ -655,7 +655,7 @@ void __attribute__ ((constructor)) GNUNET_cpustats_ltdl_init () initMachCpuStats (); updateUsage (); /* initialize */ #elif MINGW - InitWinEnv (NULL); + GNInitWinEnv (NULL); updateUsage (); /* initialize */ #else updateUsage (); /* initialize */ @@ -676,7 +676,7 @@ void __attribute__ ((destructor)) GNUNET_cpustats_ltdl_fini () #elif defined(DARWIN) GNUNET_free_non_null (prev_cpu_load); #elif MINGW - ShutdownWinEnv (); + GNShutdownWinEnv (); #endif } diff --git a/src/util/winproc.c b/src/util/winproc.c index bd2f2d091..2df638362 100644 --- a/src/util/winproc.c +++ b/src/util/winproc.c @@ -83,7 +83,7 @@ plibc_panic (int err, char *msg) * @return Error code from winerror.h, ERROR_SUCCESS on success */ int -InitWinEnv () +GNInitWinEnv () { int ret; @@ -231,7 +231,7 @@ InitWinEnv () * Clean up Windows environment */ void -ShutdownWinEnv () +GNShutdownWinEnv () { plibc_shutdown ();