diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-01 00:31:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-01 00:31:40 +0300 |
| commit | 5ea7ba0c30836d3260f5fb54fff6a139c2dd1a85 (patch) | |
| tree | f412cbbb829300a34ae3c9c9deadb7e1e1fcce91 /src/net | |
| parent | 821fed1c2ddbab0d09d53b87b557ced62ad071a4 (diff) | |
| download | manaplus-5ea7ba0c30836d3260f5fb54fff6a139c2dd1a85.tar.gz manaplus-5ea7ba0c30836d3260f5fb54fff6a139c2dd1a85.tar.bz2 manaplus-5ea7ba0c30836d3260f5fb54fff6a139c2dd1a85.tar.xz manaplus-5ea7ba0c30836d3260f5fb54fff6a139c2dd1a85.zip | |
Fix include order in sdltcpnet.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/sdltcpnet.cpp | 8 | ||||
| -rw-r--r-- | 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 <http://www.gnu.org/licenses/>. */ -#include "net/sdltcpnet.h" +#include "logger.h" #if defined __linux__ || defined __linux -#include "logger.h" #include <sys/socket.h> @@ -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 <SDL_net.h> -PRAGMACLANG6(GCC diagnostic pop) #include "localconsts.h" |