diff options
| author | Pavel Labath <labath@google.com> | 2016-01-12 10:43:06 -0500 |
|---|---|---|
| committer | Mark Mentovai <mark@chromium.org> | 2016-01-12 10:43:06 -0500 |
| commit | 4f512397f5d7fcff4681b2e6b651c28d881bfb34 (patch) | |
| tree | 2ed408ab5b8ccd8d8898254356cbaabd006a5135 /src/third_party | |
| parent | Define intptr and uintptr in a more generic way (diff) | |
| download | breakpad-4f512397f5d7fcff4681b2e6b651c28d881bfb34.tar.xz | |
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 <labath@google.com>.
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/libdisasm/libdis.h | 4 |
1 files changed, 0 insertions, 4 deletions
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 <windows.h> -#endif - #include <stdint.h> /* 'NEW" types |