engine: don't include windows headers, as they globally included by port.h already
This commit is contained in:
parent
505392c2f8
commit
8bb6aa2c51
5 changed files with 8 additions and 23 deletions
|
@ -20,11 +20,8 @@ GNU General Public License for more details.
|
||||||
#include "build.h"
|
#include "build.h"
|
||||||
|
|
||||||
#if !defined(_WIN32)
|
#if !defined(_WIN32)
|
||||||
#include <limits.h>
|
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#define PATH_SPLITTER "/"
|
#define PATH_SPLITTER "/"
|
||||||
|
|
||||||
|
@ -130,13 +127,9 @@ GNU General Public License for more details.
|
||||||
#endif
|
#endif
|
||||||
#endif //WIN32
|
#endif //WIN32
|
||||||
|
|
||||||
#ifndef INT_MAX
|
#include <stdlib.h>
|
||||||
#define INT_MAX 2147483647
|
#include <string.h>
|
||||||
#endif
|
#include <limits.h>
|
||||||
|
|
||||||
#ifndef USHRT_MAX
|
|
||||||
#define USHRT_MAX 65535
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined XASH_SDL && !defined REF_DLL
|
#if defined XASH_SDL && !defined REF_DLL
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
|
|
|
@ -22,10 +22,6 @@ GNU General Public License for more details.
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#include "windows.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "platform/platform.h"
|
#include "platform/platform.h"
|
||||||
|
|
||||||
void* in_mousecursor;
|
void* in_mousecursor;
|
||||||
|
|
|
@ -17,9 +17,7 @@ GNU General Public License for more details.
|
||||||
#include "miniz.h"
|
#include "miniz.h"
|
||||||
#include "imagelib.h"
|
#include "imagelib.h"
|
||||||
#include "mathlib.h"
|
#include "mathlib.h"
|
||||||
#ifdef _WIN32
|
#ifndef _WIN32
|
||||||
#include <winsock2.h>
|
|
||||||
#else
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,6 @@ GNU General Public License for more details.
|
||||||
#include "mathlib.h"
|
#include "mathlib.h"
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// Winsock
|
// Winsock
|
||||||
#include <winsock2.h>
|
|
||||||
#include <WS2tcpip.h>
|
#include <WS2tcpip.h>
|
||||||
#else
|
#else
|
||||||
// BSD sockets
|
// BSD sockets
|
||||||
|
|
|
@ -13,7 +13,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
GNU General Public License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
#include "platform/platform.h"
|
#include "platform/platform.h"
|
||||||
#include "menu_int.h"
|
#include "menu_int.h"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue