From 1c46a4880f2607658bf76f4958fc2e80a0618191 Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Mon, 14 Jun 2004 11:10:53 +0000 Subject: [PATCH] global.h must be included before anything else. it sets up such things as disabling stupid warnings for some archs. --- stepmania/src/NetworkSyncManager.cpp | 3 +-- stepmania/src/ezsockets.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 6598c5ab0d..b47b13a9a4 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -1,6 +1,5 @@ -//This order needed to avoid Linux lib conflicts -#include "ezsockets.h" #include "global.h" +#include "ezsockets.h" #include "NetworkSyncManager.h" #include "ProfileManager.h" #include "RageLog.h" diff --git a/stepmania/src/ezsockets.cpp b/stepmania/src/ezsockets.cpp index 1dfc7c2919..08f079f6e1 100644 --- a/stepmania/src/ezsockets.cpp +++ b/stepmania/src/ezsockets.cpp @@ -9,9 +9,8 @@ ********************************************/ // We need the WinSock32 Library on Windows -//This order needed to avoid Linux lib conflicts -#include "ezsockets.h" #include "global.h" +#include "ezsockets.h" #if defined(WIN32) #pragma comment(lib,"wsock32.lib")