From dc6689037bd318d1e60ff9cf27c165cb3e94e83c Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Sat, 26 Mar 2016 15:18:25 -0400 Subject: [PATCH] clean up Windows #include's and use winsock2 --- CMakeLists.txt | 3 +-- include/psnet.h | 3 +-- include/psnet2.h | 3 +-- include/stand_gui.h | 4 +++- src/ac/ac.cpp | 3 --- src/cfile/cfile.cpp | 2 -- src/cfile/cfilearchive.cpp | 6 ------ src/cfile/cfilelist.cpp | 6 ------ src/cfile/cfilesystem.cpp | 3 --- src/cfilearchiver/cfilearchiver.cpp | 1 - src/fonttool/fontkern.cpp | 7 ++----- src/freespace2/freespace.cpp | 8 -------- src/graphics/2d.cpp | 5 ----- src/inetfile/cftp.cpp | 3 +-- src/inetfile/chttpget.cpp | 3 +-- src/inetfile/inetgetfile.cpp | 3 +-- src/network/chat_api.cpp | 2 +- src/network/multi.cpp | 2 +- src/network/multi_endgame.cpp | 1 - src/network/multi_options.cpp | 3 --- src/network/multi_pause.cpp | 3 --- src/network/multi_update.cpp | 2 +- src/network/multi_xfer.cpp | 3 +-- src/network/multilag.cpp | 2 +- src/network/multiui.cpp | 3 +-- src/network/multiutil.cpp | 2 +- src/network/psnet.cpp | 5 +---- src/network/psnet2.cpp | 5 +---- src/network/stand_gui.cpp | 1 - src/stats/stats.cpp | 4 ---- 30 files changed, 20 insertions(+), 81 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57249bd..c9bf16a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,8 +63,7 @@ if(NOT WIN32) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3") else() set(PLATFORM_LIBRARIES - wsock32.lib - winmm.lib + ws2_32.lib ) add_definitions(/D _CRT_SECURE_NO_WARNINGS) diff --git a/include/psnet.h b/include/psnet.h index 168dac5..4ef8b88 100644 --- a/include/psnet.h +++ b/include/psnet.h @@ -190,8 +190,7 @@ #include #include #else -#define WIN32_LEAN_AND_MEAN -#include +#include #endif #include "pstypes.h" diff --git a/include/psnet2.h b/include/psnet2.h index af2ff09..d260a96 100644 --- a/include/psnet2.h +++ b/include/psnet2.h @@ -78,8 +78,7 @@ #include #include #else -#define WIN32_LEAN_AND_MEAN -#include +#include #endif #include "pstypes.h" diff --git a/include/stand_gui.h b/include/stand_gui.h index 1492e93..f3629db 100644 --- a/include/stand_gui.h +++ b/include/stand_gui.h @@ -10,6 +10,9 @@ #ifndef STAND_GUI_H #define STAND_GUI_H +// must come first to prevent wxWidgets from including winsock.h on Windows +#include + #include "wx/wxprec.h" #ifndef WX_PRECOMP @@ -20,7 +23,6 @@ #include "wx/treectrl.h" #include "wx/evtloop.h" -#include #include #include diff --git a/src/ac/ac.cpp b/src/ac/ac.cpp index c55fc5f..5c7e74d 100644 --- a/src/ac/ac.cpp +++ b/src/ac/ac.cpp @@ -61,9 +61,6 @@ * $NoKeywords: $ */ -#ifdef WIN32 -#include -#endif #include #include #include diff --git a/src/cfile/cfile.cpp b/src/cfile/cfile.cpp index 0508e18..e3d64ee 100644 --- a/src/cfile/cfile.cpp +++ b/src/cfile/cfile.cpp @@ -216,8 +216,6 @@ #ifndef PLAT_UNIX #include #include -#include -#include /* needed for memory mapping of file functions */ #else #include #include diff --git a/src/cfile/cfilearchive.cpp b/src/cfile/cfilearchive.cpp index 9fca15a..5522707 100644 --- a/src/cfile/cfilearchive.cpp +++ b/src/cfile/cfilearchive.cpp @@ -81,12 +81,6 @@ #include #include #include -#ifndef PLAT_UNIX -#include -#include -#include -#include /* needed for memory mapping of file functions */ -#endif #include "pstypes.h" #include "cfile.h" diff --git a/src/cfile/cfilelist.cpp b/src/cfile/cfilelist.cpp index 7625523..83cc320 100644 --- a/src/cfile/cfilelist.cpp +++ b/src/cfile/cfilelist.cpp @@ -62,12 +62,6 @@ #include #include #include -#ifndef PLAT_UNIX -#include -#include -#include -#include /* needed for memory mapping of file functions */ -#endif #include "pstypes.h" #include "cfile.h" diff --git a/src/cfile/cfilesystem.cpp b/src/cfile/cfilesystem.cpp index 898ca01..104a8d2 100644 --- a/src/cfile/cfilesystem.cpp +++ b/src/cfile/cfilesystem.cpp @@ -125,9 +125,6 @@ #include #ifndef PLAT_UNIX #include -#include -#include -#include /* needed for memory mapping of file functions */ #else #include #include diff --git a/src/cfilearchiver/cfilearchiver.cpp b/src/cfilearchiver/cfilearchiver.cpp index b47a545..717e979 100644 --- a/src/cfilearchiver/cfilearchiver.cpp +++ b/src/cfilearchiver/cfilearchiver.cpp @@ -48,7 +48,6 @@ #include #include #ifndef PLAT_UNIX -#include #include #include #else diff --git a/src/fonttool/fontkern.cpp b/src/fonttool/fontkern.cpp index 9f57e1d..e30e676 100644 --- a/src/fonttool/fontkern.cpp +++ b/src/fonttool/fontkern.cpp @@ -103,15 +103,12 @@ */ #ifndef PLAT_UNIX -#include +#include +#include #endif #include #include #include -#ifndef PLAT_UNIX -#include -#include -#endif #include "pstypes.h" #include "osapi.h" diff --git a/src/freespace2/freespace.cpp b/src/freespace2/freespace.cpp index aec8d65..4bb58ad 100644 --- a/src/freespace2/freespace.cpp +++ b/src/freespace2/freespace.cpp @@ -556,14 +556,6 @@ * */ -#ifndef PLAT_UNIX -#include -#include -#include -#include -#else -#endif - #include #include #include diff --git a/src/graphics/2d.cpp b/src/graphics/2d.cpp index c5282a5..c08a38f 100644 --- a/src/graphics/2d.cpp +++ b/src/graphics/2d.cpp @@ -469,11 +469,6 @@ * $NoKeywords: $ */ -#ifndef PLAT_UNIX -#include -#include -#endif - #include "osapi.h" #include "2d.h" #include "3d.h" diff --git a/src/inetfile/cftp.cpp b/src/inetfile/cftp.cpp index 122e31b..7bfd539 100644 --- a/src/inetfile/cftp.cpp +++ b/src/inetfile/cftp.cpp @@ -69,8 +69,7 @@ #ifndef PLAT_UNIX -#include -#include +#include #else #include #include diff --git a/src/inetfile/chttpget.cpp b/src/inetfile/chttpget.cpp index f435c30..a461080 100644 --- a/src/inetfile/chttpget.cpp +++ b/src/inetfile/chttpget.cpp @@ -118,8 +118,7 @@ #ifndef PLAT_UNIX -#include -#include +#include #else #include #include diff --git a/src/inetfile/inetgetfile.cpp b/src/inetfile/inetgetfile.cpp index 934bf29..f0d1620 100644 --- a/src/inetfile/inetgetfile.cpp +++ b/src/inetfile/inetgetfile.cpp @@ -56,8 +56,7 @@ #ifndef PLAT_UNIX -#include -#include +#include #endif #include diff --git a/src/network/chat_api.cpp b/src/network/chat_api.cpp index 96e3aef..9a0cea4 100644 --- a/src/network/chat_api.cpp +++ b/src/network/chat_api.cpp @@ -22,7 +22,7 @@ #define WSAGetLastError() (errno) #else -#include +#include typedef int socklen_t; #endif diff --git a/src/network/multi.cpp b/src/network/multi.cpp index 8eed351..928290b 100644 --- a/src/network/multi.cpp +++ b/src/network/multi.cpp @@ -190,7 +190,7 @@ */ #ifndef PLAT_UNIX -#include +#include #endif #include "pstypes.h" diff --git a/src/network/multi_endgame.cpp b/src/network/multi_endgame.cpp index eca9e9e..b58f184 100644 --- a/src/network/multi_endgame.cpp +++ b/src/network/multi_endgame.cpp @@ -202,7 +202,6 @@ * $NoKeywords: $ */ -// #include #include "multi.h" #include "popup.h" #include "object.h" diff --git a/src/network/multi_options.cpp b/src/network/multi_options.cpp index 27dbb4b..fe8d71a 100644 --- a/src/network/multi_options.cpp +++ b/src/network/multi_options.cpp @@ -198,9 +198,6 @@ * $NoKeywords: $ */ -#ifndef PLAT_UNIX -#include -#endif #include "cmdline.h" #include "osregistry.h" #include "multi.h" diff --git a/src/network/multi_pause.cpp b/src/network/multi_pause.cpp index 68aba36..5811f6e 100644 --- a/src/network/multi_pause.cpp +++ b/src/network/multi_pause.cpp @@ -117,9 +117,6 @@ * $NoKeywords: $ */ -#ifndef PLAT_UNIX -#include -#endif #include "chatbox.h" #include "ui.h" #include "freespace.h" diff --git a/src/network/multi_update.cpp b/src/network/multi_update.cpp index c9b5707..66b5639 100644 --- a/src/network/multi_update.cpp +++ b/src/network/multi_update.cpp @@ -116,7 +116,7 @@ */ #ifndef PLAT_UNIX -#include +#include #endif #include "multi_update.h" #include "popup.h" diff --git a/src/network/multi_xfer.cpp b/src/network/multi_xfer.cpp index 0b594e4..bedae6f 100644 --- a/src/network/multi_xfer.cpp +++ b/src/network/multi_xfer.cpp @@ -194,8 +194,7 @@ */ #ifndef PLAT_UNIX -#include -#include +#include #endif #include "multi_xfer.h" #include "cfile.h" diff --git a/src/network/multilag.cpp b/src/network/multilag.cpp index 7a85021..0d1d09e 100644 --- a/src/network/multilag.cpp +++ b/src/network/multilag.cpp @@ -101,7 +101,7 @@ */ #ifndef PLAT_UNIX -#include +#include #else #include #include diff --git a/src/network/multiui.cpp b/src/network/multiui.cpp index bb46cf2..91b57f3 100644 --- a/src/network/multiui.cpp +++ b/src/network/multiui.cpp @@ -467,8 +467,7 @@ */ #ifndef PLAT_UNIX -#include -#include // for inet_addr() +#include // for inet_addr() #else #include #include diff --git a/src/network/multiutil.cpp b/src/network/multiutil.cpp index 949364d..1e4fd0a 100644 --- a/src/network/multiutil.cpp +++ b/src/network/multiutil.cpp @@ -227,7 +227,7 @@ */ #ifndef PLAT_UNIX -#include +#include #else #include #include diff --git a/src/network/psnet.cpp b/src/network/psnet.cpp index ecd6ce7..fd05169 100644 --- a/src/network/psnet.cpp +++ b/src/network/psnet.cpp @@ -123,10 +123,7 @@ #ifndef PLAT_UNIX -#include -#include -#include -#include +#include #include #include #else diff --git a/src/network/psnet2.cpp b/src/network/psnet2.cpp index 5ea7094..5ea26f1 100644 --- a/src/network/psnet2.cpp +++ b/src/network/psnet2.cpp @@ -145,10 +145,7 @@ */ #ifndef PLAT_UNIX -#include -#include -#include -#include +#include #include #include #else diff --git a/src/network/stand_gui.cpp b/src/network/stand_gui.cpp index 70235a1..935b04c 100644 --- a/src/network/stand_gui.cpp +++ b/src/network/stand_gui.cpp @@ -7,7 +7,6 @@ * */ - #include "stand_gui.h" #include "osregistry.h" diff --git a/src/stats/stats.cpp b/src/stats/stats.cpp index fb46669..073b671 100644 --- a/src/stats/stats.cpp +++ b/src/stats/stats.cpp @@ -192,10 +192,6 @@ * $NoKeywords: $ */ -#ifndef PLAT_UNIX -#include -#include -#endif #include "freespace.h" #include "gamesequence.h" #include "key.h" -- 2.39.2