From 4f512397f5d7fcff4681b2e6b651c28d881bfb34 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Tue, 12 Jan 2016 10:43:06 -0500 Subject: libdisasm: Remove inclusion of windows.h windows.h defines exception_code as a macro, which conflicts with our use of the identifier in exception records. It appears that this particular include of windows.h is not needed, so instead of undefining the macro, I simply delete the include. Build tested with MSVC 2013. BUG= R=mark@chromium.org Review URL: https://codereview.chromium.org/1579623004 . Patch from Pavel Labath . --- src/third_party/libdisasm/libdis.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/third_party') diff --git a/src/third_party/libdisasm/libdis.h b/src/third_party/libdisasm/libdis.h index 94103396..83a88612 100644 --- a/src/third_party/libdisasm/libdis.h +++ b/src/third_party/libdisasm/libdis.h @@ -1,10 +1,6 @@ #ifndef LIBDISASM_H #define LIBDISASM_H -#ifdef WIN32 -#include -#endif - #include /* 'NEW" types -- cgit v1.2.1