diff options
author | 2017-05-14 16:49:49 +0100 | |
---|---|---|
committer | 2017-05-14 16:49:49 +0100 | |
commit | f7f4b2126e4faefcd18155d84750e11e45e9d421 (patch) | |
tree | 5c555783771da3b1dcd1dd66613dc34dd03a35b4 | |
parent | aca23ef3bae2f9eeb290ed5bb390e3b7265d1423 (diff) |
Revert "reordering the #include lets you build this file with latest mingw headers (nw)"
This reverts commit c3b10caf4e83135756ce400ec39d1b10b7d97b93.
-rw-r--r-- | src/lib/util/unicode.cpp | 9 | ||||
-rw-r--r-- | src/osd/osdsync.cpp | 10 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/lib/util/unicode.cpp b/src/lib/util/unicode.cpp index 66d74f7fe99..b48cef44c79 100644 --- a/src/lib/util/unicode.cpp +++ b/src/lib/util/unicode.cpp @@ -8,7 +8,10 @@ ***************************************************************************/ +#include "unicode.h" + #ifdef _WIN32 +#include "strconv.h" #define UTF8PROC_DLLEXPORT #endif @@ -17,12 +20,6 @@ #include <codecvt> #include <locale> -#include "unicode.h" - -#ifdef _WIN32 -#include "strconv.h" -#endif - //------------------------------------------------- // uchar_isvalid - return true if a given diff --git a/src/osd/osdsync.cpp b/src/osd/osdsync.cpp index 44218593fd8..12253f2acbd 100644 --- a/src/osd/osdsync.cpp +++ b/src/osd/osdsync.cpp @@ -5,11 +5,6 @@ // osdsync.c - OSD core work item functions // //============================================================ -#include <mutex> -#include <atomic> -#include <thread> -#include <vector> -#include <algorithm> #if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32) // standard windows headers #include <windows.h> @@ -21,6 +16,11 @@ #include <stdint.h> #endif #endif +#include <mutex> +#include <atomic> +#include <thread> +#include <vector> +#include <algorithm> // MAME headers #include "osdcore.h" #include "osdsync.h" |