From eabb8eed0bc3b2b16722eeb38d8000eda35668a7 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Mon, 15 Nov 2010 08:48:57 +0100 Subject: Fix compiler warnings about not used dummy() functions It has been reported that the Microsoft Visual C compiler complains if a .c file do not contain any compilable code, which can happen if the code has been #ifdef'ed out. To avoid this, these #ifdef sections have a #else section which adds a static dummy() function which does nothing. On the other hand, the GNU C compiler complains about unused functions when it discovers this situation. This patch tries to only add these dummy() functions if the Microsoft Visual C compiler is detected, via the _MSC_VER macro. Signed-off-by: David Sommerseth Acked-by: Peter Stuge --- cryptoapi.c | 2 ++ ieproxy.c | 3 ++- perf.c | 2 ++ pkcs11.c | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cryptoapi.c b/cryptoapi.c index 8fb5387..3365cd7 100644 --- a/cryptoapi.c +++ b/cryptoapi.c @@ -470,5 +470,7 @@ int SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop) } #else +#ifdef _MSC_VER /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */ static void dummy (void) {} +#endif #endif /* WIN32 */ diff --git a/ieproxy.c b/ieproxy.c index 89977a8..3099870 100644 --- a/ieproxy.c +++ b/ieproxy.c @@ -139,7 +139,8 @@ LPCTSTR getIeHttpProxy() return(NULL); } } - #else +#ifdef _MSC_VER /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */ static void dummy (void) {} +#endif #endif /* WIN32 */ diff --git a/perf.c b/perf.c index a149c07..67ea958 100644 --- a/perf.c +++ b/perf.c @@ -287,5 +287,7 @@ perf_print_state (int lev) } #else +#ifdef _MSC_VER /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */ static void dummy(void) {} #endif +#endif diff --git a/pkcs11.c b/pkcs11.c index e06a2ed..d90ac96 100644 --- a/pkcs11.c +++ b/pkcs11.c @@ -982,5 +982,7 @@ cleanup: } #else +#ifdef _MSC_VER /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */ static void dummy (void) {} +#endif #endif /* ENABLE_PKCS11 */ -- cgit