mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-26 02:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify some _WIN32 includes

Browse Source
This commit is contained in:
twinaphex 2013-04-11 22:35:15 +02:00
parent ddd6acd4e2
commit da8bbde11d
5 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
file.c
View File

@ -27,14 +27,16 @@
#include "hash.h" #include "hash.h"
#include "file_extract.h" #include "file_extract.h"
#if defined(_WIN32) && !defined(_XBOX) #ifdef _WIN32
#include <io.h> #ifdef _XBOX
#include <fcntl.h>
#include <windows.h>
#elif defined(_XBOX)
#include <xtl.h> #include <xtl.h>
#define setmode _setmode #define setmode _setmode
#define INVALID_FILE_ATTRIBUTES -1 #define INVALID_FILE_ATTRIBUTES -1
#else
#include <io.h>
#include <fcntl.h>
#include <windows.h>
#endif
#endif #endif
// Dump stuff to file. // Dump stuff to file.

18
file_path.c
View File

@ -29,21 +29,19 @@
#endif #endif
#endif #endif
#ifdef _XBOX #if defined(_WIN32)
#include <xtl.h>
#endif
#if defined(_WIN32) && !defined(_XBOX)
#include <io.h>
#include <fcntl.h>
#include <windows.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#define setmode _setmode #define setmode _setmode
#endif #endif
#elif defined(_XBOX) #ifdef _XBOX
#define setmode _setmode #include <xtl.h>
#define INVALID_FILE_ATTRIBUTES -1 #define INVALID_FILE_ATTRIBUTES -1
#else #else
#include <io.h>
#include <fcntl.h>
#include <windows.h>
#endif
#else
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h> #include <dirent.h>

10
general.h
View File

@ -51,15 +51,13 @@
#endif #endif
// Windows // Windows
#if defined(_WIN32) && !defined(_XBOX) #ifdef _WIN32
#ifdef _XBOX
#include <xtl.h>
#else
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include "msvc/msvc_compat.h"
#endif #endif
// XBox
#if defined(_XBOX)
#include <xtl.h>
#include "msvc/msvc_compat.h" #include "msvc/msvc_compat.h"
#endif #endif

9
retroarch.c
View File

@ -35,14 +35,13 @@
#include "compat/getopt_rarch.h" #include "compat/getopt_rarch.h"
#include "compat/posix_string.h" #include "compat/posix_string.h"
#if defined(_WIN32) && !defined(_XBOX) #ifdef _WIN32
#ifdef _XBOX
#include <xtl.h>
#else
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#elif defined(_XBOX)
#include <xtl.h>
#endif #endif
#ifdef _WIN32
#include "msvc/msvc_compat.h" #include "msvc/msvc_compat.h"
#endif #endif

8
thread.c
View File

@ -16,11 +16,13 @@
#include "thread.h" #include "thread.h"
#include <stdlib.h> #include <stdlib.h>
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32)
#ifdef _XBOX
#include <xtl.h>
#else
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#elif defined(_XBOX) #endif
#include <xtl.h>
#elif defined(GEKKO) #elif defined(GEKKO)
#include "thread/gx_pthread.h" #include "thread/gx_pthread.h"
#else #else