From 5ea7ba0c30836d3260f5fb54fff6a139c2dd1a85 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 1 May 2016 00:31:40 +0300 Subject: Fix include order in sdltcpnet. --- src/net/sdltcpnet.cpp | 8 ++++++-- src/net/sdltcpnet.h | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp index 48f68a8b2..3d6ee5d7d 100644 --- a/src/net/sdltcpnet.cpp +++ b/src/net/sdltcpnet.cpp @@ -18,10 +18,9 @@ * along with this program. If not, see . */ -#include "net/sdltcpnet.h" +#include "logger.h" #if defined __linux__ || defined __linux -#include "logger.h" #include @@ -42,6 +41,11 @@ #endif +PRAGMACLANG6(GCC diagnostic push) +PRAGMACLANG6(GCC diagnostic ignored "-Wold-style-cast") +#include "net/sdltcpnet.h" +PRAGMACLANG6(GCC diagnostic pop) + #include "debug.h" #if !defined(__native_client__) \ diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h index b67abfcc3..94855485d 100644 --- a/src/net/sdltcpnet.h +++ b/src/net/sdltcpnet.h @@ -30,10 +30,7 @@ #pragma GCC diagnostic pop #endif -PRAGMACLANG6(GCC diagnostic push) -PRAGMACLANG6(GCC diagnostic ignored "-Wold-style-cast") #include -PRAGMACLANG6(GCC diagnostic pop) #include "localconsts.h" -- cgit v1.2.3-70-g09d2