diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
| commit | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch) | |
| tree | b48831a898906734f8884d08b6e18f1144ee2b82 /src/ToolBox/SOS/Strike/inc/dbgeng.h | |
| parent | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff) | |
| download | coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2 coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip | |
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'src/ToolBox/SOS/Strike/inc/dbgeng.h')
| -rw-r--r-- | src/ToolBox/SOS/Strike/inc/dbgeng.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/ToolBox/SOS/Strike/inc/dbgeng.h b/src/ToolBox/SOS/Strike/inc/dbgeng.h index 73e4d19f99..cf04574c12 100644 --- a/src/ToolBox/SOS/Strike/inc/dbgeng.h +++ b/src/ToolBox/SOS/Strike/inc/dbgeng.h @@ -42,7 +42,11 @@ typedef struct _MEMORY_BASIC_INFORMATION64* PMEMORY_BASIC_INFORMATION64; #define __out_xcount(x) #define __inout #define __inout_opt -#define __reserved +// Android defines various fields on struct which are named __reserved[x]; for example, in wchar.h, +// so we must prefix __reserved with __clr_ +#define __clr_reserved +#else +#define __clr_reserved __reserved #endif #ifdef __cplusplus @@ -1509,7 +1513,7 @@ DECLARE_INTERFACE_(IDebugClient, IUnknown) THIS_ __in ULONG Flags, __in PCSTR Options, - __in_opt __reserved PVOID Reserved + __in_opt __clr_reserved PVOID Reserved ) PURE; STDMETHOD(ConnectProcessServer)( THIS_ @@ -1937,7 +1941,7 @@ DECLARE_INTERFACE_(IDebugClient2, IUnknown) THIS_ __in ULONG Flags, __in PCSTR Options, - __in_opt __reserved PVOID Reserved + __in_opt __clr_reserved PVOID Reserved ) PURE; STDMETHOD(ConnectProcessServer)( THIS_ @@ -2394,7 +2398,7 @@ DECLARE_INTERFACE_(IDebugClient3, IUnknown) THIS_ __in ULONG Flags, __in PCSTR Options, - __in_opt __reserved PVOID Reserved + __in_opt __clr_reserved PVOID Reserved ) PURE; STDMETHOD(ConnectProcessServer)( THIS_ @@ -2902,7 +2906,7 @@ DECLARE_INTERFACE_(IDebugClient4, IUnknown) THIS_ __in ULONG Flags, __in PCSTR Options, - __in_opt __reserved PVOID Reserved + __in_opt __clr_reserved PVOID Reserved ) PURE; STDMETHOD(ConnectProcessServer)( THIS_ @@ -3449,7 +3453,7 @@ DECLARE_INTERFACE_(IDebugClient5, IUnknown) THIS_ __in ULONG Flags, __in PCSTR Options, - __in_opt __reserved PVOID Reserved + __in_opt __clr_reserved PVOID Reserved ) PURE; STDMETHOD(ConnectProcessServer)( THIS_ @@ -3961,7 +3965,7 @@ DECLARE_INTERFACE_(IDebugClient5, IUnknown) THIS_ __in ULONG Flags, __in PCWSTR Options, - __in_opt __reserved PVOID Reserved + __in_opt __clr_reserved PVOID Reserved ) PURE; STDMETHOD(ConnectProcessServerWide)( THIS_ |