From b3470b32ed0f28a4e563f8fd40c806048a1b3c5a Mon Sep 17 00:00:00 2001 From: Fred Wulff Date: Mon, 14 Jun 2004 03:47:42 +0000 Subject: [PATCH] Fixed Linux compile issue (lib conflict) --- stepmania/src/NetworkSyncManager.cpp | 3 ++- stepmania/src/ezsockets.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index c771a2b602..6598c5ab0d 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -1,7 +1,8 @@ +//This order needed to avoid Linux lib conflicts +#include "ezsockets.h" #include "global.h" #include "NetworkSyncManager.h" #include "ProfileManager.h" -#include "ezsockets.h" #include "RageLog.h" #include "StepMania.h" #include "RageUtil.h" diff --git a/stepmania/src/ezsockets.cpp b/stepmania/src/ezsockets.cpp index c8f2d9901c..1dfc7c2919 100644 --- a/stepmania/src/ezsockets.cpp +++ b/stepmania/src/ezsockets.cpp @@ -9,9 +9,9 @@ ********************************************/ // We need the WinSock32 Library on Windows - -#include "global.h" +//This order needed to avoid Linux lib conflicts #include "ezsockets.h" +#include "global.h" #if defined(WIN32) #pragma comment(lib,"wsock32.lib")