Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "reordering the #include lets you build this file with latest mingw headers (nw)"

Browse Source 
This reverts commit c3b10caf4e.
This commit is contained in:
smf- 2017-05-14 16:49:49 +01:00
parent aca23ef3ba
commit f7f4b2126e
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/util/unicode.cpp
View File

@ -8,7 +8,10 @@
***************************************************************************/ ***************************************************************************/
#include "unicode.h"
#ifdef _WIN32 #ifdef _WIN32
#include "strconv.h"
#define UTF8PROC_DLLEXPORT #define UTF8PROC_DLLEXPORT
#endif #endif
@ -17,12 +20,6 @@
#include <codecvt> #include <codecvt>
#include <locale> #include <locale>
#include "unicode.h"
#ifdef _WIN32
#include "strconv.h"
#endif
//------------------------------------------------- //-------------------------------------------------
// uchar_isvalid - return true if a given // uchar_isvalid - return true if a given

10
src/osd/osdsync.cpp
View File

@ -5,11 +5,6 @@
// osdsync.c - OSD core work item functions // osdsync.c - OSD core work item functions
// //
//============================================================ //============================================================
#include <mutex>
#include <atomic>
#include <thread>
#include <vector>
#include <algorithm>
#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32) #if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
// standard windows headers // standard windows headers
#include <windows.h> #include <windows.h>
@ -21,6 +16,11 @@
#include <stdint.h> #include <stdint.h>
#endif #endif
#endif #endif
#include <mutex>
#include <atomic>
#include <thread>
#include <vector>
#include <algorithm>
// MAME headers // MAME headers
#include "osdcore.h" #include "osdcore.h"
#include "osdsync.h" #include "osdsync.h"