Browse Source

engine: don't include windows headers, as they globally included by port.h already

pull/2/head
Alibek Omarov 5 years ago
parent
commit
8bb6aa2c51
  1. 13
      common/port.h
  2. 4
      engine/client/input.c
  3. 4
      engine/common/imagelib/img_png.c
  4. 1
      engine/common/net_ws.c
  5. 1
      engine/platform/win32/sys_win.c

13
common/port.h

@ -20,11 +20,8 @@ GNU General Public License for more details. @@ -20,11 +20,8 @@ GNU General Public License for more details.
#include "build.h"
#if !defined(_WIN32)
#include <limits.h>
#include <dlfcn.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#define PATH_SPLITTER "/"
@ -130,13 +127,9 @@ GNU General Public License for more details. @@ -130,13 +127,9 @@ GNU General Public License for more details.
#endif
#endif //WIN32
#ifndef INT_MAX
#define INT_MAX 2147483647
#endif
#ifndef USHRT_MAX
#define USHRT_MAX 65535
#endif
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#if defined XASH_SDL && !defined REF_DLL
#include <SDL.h>

4
engine/client/input.c

@ -22,10 +22,6 @@ GNU General Public License for more details. @@ -22,10 +22,6 @@ GNU General Public License for more details.
#include <SDL.h>
#endif
#ifdef _WIN32
#include "windows.h"
#endif
#include "platform/platform.h"
void* in_mousecursor;

4
engine/common/imagelib/img_png.c

@ -17,9 +17,7 @@ GNU General Public License for more details. @@ -17,9 +17,7 @@ GNU General Public License for more details.
#include "miniz.h"
#include "imagelib.h"
#include "mathlib.h"
#ifdef _WIN32
#include <winsock2.h>
#else
#ifndef _WIN32
#include <netinet/in.h>
#endif

1
engine/common/net_ws.c

@ -19,7 +19,6 @@ GNU General Public License for more details. @@ -19,7 +19,6 @@ GNU General Public License for more details.
#include "mathlib.h"
#ifdef _WIN32
// Winsock
#include <winsock2.h>
#include <WS2tcpip.h>
#else
// BSD sockets

1
engine/platform/win32/sys_win.c

@ -13,7 +13,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -13,7 +13,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
*/
#include <windows.h>
#include "platform/platform.h"
#include "menu_int.h"

Loading…
Cancel
Save