From 392b73ac99fe60b7d38a619879b0766e9aa2fa5a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 26 Jul 2023 18:23:52 +0200 Subject: [PATCH] easy: remove #ifdefs to make code easier on the eye Closes #11525 --- lib/easy.c | 4 ---- lib/system_win32.h | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/easy.c b/lib/easy.c index d034629b57..42cdbe0a77 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -168,19 +168,15 @@ static CURLcode global_init(long flags, bool memoryfuncs) goto fail; } -#ifdef WIN32 if(Curl_win32_init(flags)) { DEBUGF(fprintf(stderr, "Error: win32_init failed\n")); goto fail; } -#endif -#ifdef __AMIGA__ if(Curl_amiga_init()) { DEBUGF(fprintf(stderr, "Error: Curl_amiga_init failed\n")); goto fail; } -#endif if(Curl_macos_init()) { DEBUGF(fprintf(stderr, "Error: Curl_macos_init failed\n")); diff --git a/lib/system_win32.h b/lib/system_win32.h index 24899cb2d5..6482643fab 100644 --- a/lib/system_win32.h +++ b/lib/system_win32.h @@ -42,7 +42,8 @@ extern IF_NAMETOINDEX_FN Curl_if_nametoindex; /* This is used to dynamically load DLLs */ HMODULE Curl_load_library(LPCTSTR filename); - -#endif /* WIN32 */ +#else /* WIN32 */ +#define Curl_win32_init(x) CURLE_OK +#endif /* !WIN32 */ #endif /* HEADER_CURL_SYSTEM_WIN32_H */