diff options
| author | Sinan Kaya <41809318+franksinankaya@users.noreply.github.com> | 2019-02-14 14:06:57 -0500 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-02-14 11:06:57 -0800 |
| commit | 36931ac7b24249201547f7ca667105014b2e4c7f (patch) | |
| tree | 1ad562f7776e57f14a884fadcd17e23911637ec8 /src/pal/inc | |
| parent | 84eaa7ac079e625f2fbe36ba976f735dbdacdc6b (diff) | |
| download | coreclr-36931ac7b24249201547f7ca667105014b2e4c7f.tar.gz coreclr-36931ac7b24249201547f7ca667105014b2e4c7f.tar.bz2 coreclr-36931ac7b24249201547f7ca667105014b2e4c7f.zip | |
Gnuport cleanup 3 (#22581)
* Reorder extern "C" and visibility statements
In file included from coreclr/src/pal/inc/pal.h:70:0,
coreclr/src/pal/inc/pal_mstypes.h:30:25: error: expected unqualified-id
before string constant
#define EXTERN_C extern "C"
^
coreclr/src/pal/inc/rt/palrt.h:216:30: note:
in expansion of macro 'EXTERN_C'
#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE
* Need double quotes around single quotes in error statements
fix error statements
Can't have ' character in error statement
* Abstract __declspec(noinline)
Generate compiler independent macros for noinline request.
* Remove unused DBG_NOINLINE_X86__RET_INLINE
* Abstract __declspec(nothrow)
Diffstat (limited to 'src/pal/inc')
| -rw-r--r-- | src/pal/inc/rt/palrt.h | 19 | ||||
| -rw-r--r-- | src/pal/inc/rt/sal.h | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/pal/inc/rt/palrt.h b/src/pal/inc/rt/palrt.h index 381eb46d80..89f28e7c74 100644 --- a/src/pal/inc/rt/palrt.h +++ b/src/pal/inc/rt/palrt.h @@ -214,6 +214,7 @@ inline void *__cdecl operator new(size_t, void *_P) #define STDAPI EXTERN_C HRESULT STDAPICALLTYPE #define STDAPI_(type) EXTERN_C type STDAPICALLTYPE +#define STDAPI_VIS(vis,type) EXTERN_C vis type STDAPICALLTYPE #define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE #define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE @@ -372,9 +373,9 @@ typedef union _ULARGE_INTEGER { /******************* OLE, BSTR, VARIANT *************************/ -DLLEXPORT STDAPI_(LPVOID) CoTaskMemAlloc(SIZE_T cb); -DLLEXPORT STDAPI_(LPVOID) CoTaskMemRealloc(LPVOID pv, SIZE_T cb); -DLLEXPORT STDAPI_(void) CoTaskMemFree(LPVOID pv); +STDAPI_VIS(DLLEXPORT, LPVOID) CoTaskMemAlloc(SIZE_T cb); +STDAPI_VIS(DLLEXPORT, LPVOID) CoTaskMemRealloc(LPVOID pv, SIZE_T cb); +STDAPI_VIS(DLLEXPORT, void) CoTaskMemFree(LPVOID pv); typedef SHORT VARIANT_BOOL; #define VARIANT_TRUE ((VARIANT_BOOL)-1) @@ -386,12 +387,12 @@ typedef const OLECHAR* LPCOLESTR; typedef WCHAR *BSTR; -DLLEXPORT STDAPI_(BSTR) SysAllocString(const OLECHAR*); -DLLEXPORT STDAPI_(BSTR) SysAllocStringLen(const OLECHAR*, UINT); -DLLEXPORT STDAPI_(BSTR) SysAllocStringByteLen(const char *, UINT); -DLLEXPORT STDAPI_(void) SysFreeString(BSTR); -DLLEXPORT STDAPI_(UINT) SysStringLen(BSTR); -DLLEXPORT STDAPI_(UINT) SysStringByteLen(BSTR); +STDAPI_VIS(DLLEXPORT, BSTR) SysAllocString(const OLECHAR*); +STDAPI_VIS(DLLEXPORT, BSTR) SysAllocStringLen(const OLECHAR*, UINT); +STDAPI_VIS(DLLEXPORT, BSTR) SysAllocStringByteLen(const char *, UINT); +STDAPI_VIS(DLLEXPORT, void) SysFreeString(BSTR); +STDAPI_VIS(DLLEXPORT, UINT) SysStringLen(BSTR); +STDAPI_VIS(DLLEXPORT, UINT) SysStringByteLen(BSTR); typedef double DATE; diff --git a/src/pal/inc/rt/sal.h b/src/pal/inc/rt/sal.h index caf89f247d..e5622a817b 100644 --- a/src/pal/inc/rt/sal.h +++ b/src/pal/inc/rt/sal.h @@ -2363,7 +2363,7 @@ typedef struct __F_ __F_; #ifdef __cplusplus // [ #ifndef __nothrow // [ -# define __nothrow __declspec(nothrow) +# define __nothrow NOTHROW_DECL #endif // ] extern "C" { #else // ][ |