Fixing include orders and whitelisting others.

Will be broken until clang SVN 253772 is available on travis/snapshots.
This commit is contained in:
Ben Vanik
2015-11-21 11:34:46 -08:00
parent add68c3743
commit 1956b8708e
7 changed files with 11 additions and 6 deletions

View File

@@ -20,14 +20,14 @@
#define WIN32_LEAN_AND_MEAN
#endif
#define NOMINMAX
#include <SDKDDKVer.h>
#include <windows.h>
#include <ObjBase.h>
#include <SDKDDKVer.h>
#include <dwmapi.h>
#include <shellapi.h>
#include <shlwapi.h>
#include <shobjidl.h>
#include <dwmapi.h>
#include <tpcshrd.h>
#include <windows.h>
#include <windowsx.h>
#undef DeleteBitmap
#undef DeleteFile

View File

@@ -15,10 +15,12 @@
#include "xenia/base/logging.h"
// winsock includes must come after platform_win.h:
// clang-format off
#include "xenia/base/platform_win.h"
#include <mstcpip.h> // NOLINT(build/include_order)
#include <winsock2.h> // NOLINT(build/include_order)
#include <ws2tcpip.h> // NOLINT(build/include_order)
// clang-format on
namespace xe {