From 0107ef2aadd5956669e3b64fe1df6f7a8f964a3f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 22 Oct 2009 17:12:28 +0200 Subject: [PATCH] main: put #ifdef inside winsock_init() This way, the function call in the main() function does not need another pair of #ifdef/#endif. --- src/main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index 17f9c8dbd..78964e88d 100644 --- a/src/main.c +++ b/src/main.c @@ -185,9 +185,9 @@ glue_state_file_init(void) /** * Windows-only initialization of the Winsock2 library. */ -#ifdef WIN32 static void winsock_init(void) { +#ifdef WIN32 WSADATA sockinfo; int retval; @@ -203,9 +203,8 @@ static void winsock_init(void) g_error("We use Winsock2 but your version is either too new or " "old; please install Winsock 2.x\n"); } - -} #endif +} /** * Initialize the decoder and player core, including the music pipe. @@ -288,9 +287,7 @@ int main(int argc, char *argv[]) /* enable GLib's thread safety code */ g_thread_init(NULL); -#ifdef WIN32 winsock_init(); -#endif idle_init(); dirvec_init(); songvec_init();