Fixing include orders and whitelisting others.
Will be broken until clang SVN 253772 is available on travis/snapshots.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user