mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 10:23:38 +00:00
include: Add COM_DECLSPEC_NOTHROW define.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
aaaaec8642
commit
2ef00173e1
|
@ -40,9 +40,16 @@
|
|||
#define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE
|
||||
|
||||
#if defined(__cplusplus) && !defined(CINTERFACE)
|
||||
|
||||
#ifdef COM_STDMETHOD_CAN_THROW
|
||||
# define COM_DECLSPEC_NOTHROW
|
||||
#else
|
||||
# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW
|
||||
#endif
|
||||
|
||||
# define interface struct
|
||||
# define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m
|
||||
# define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m
|
||||
# define STDMETHOD(m) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE m
|
||||
# define STDMETHOD_(t,m) virtual COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE m
|
||||
# define PURE =0
|
||||
# define THIS_
|
||||
# define THIS void
|
||||
|
|
|
@ -172,12 +172,18 @@
|
|||
|
||||
#if defined(__cplusplus) && !defined(CINTERFACE)
|
||||
|
||||
#ifdef COM_STDMETHOD_CAN_THROW
|
||||
# define COM_DECLSPEC_NOTHROW
|
||||
#else
|
||||
# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW
|
||||
#endif
|
||||
|
||||
/* C++ interface */
|
||||
|
||||
#define STDMETHOD(method) virtual HRESULT STDMETHODCALLTYPE method
|
||||
#define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method
|
||||
#define STDMETHODV(method) virtual HRESULT STDMETHODVCALLTYPE method
|
||||
#define STDMETHODV_(type,method) virtual type STDMETHODVCALLTYPE method
|
||||
#define STDMETHOD(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method
|
||||
#define STDMETHOD_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODCALLTYPE method
|
||||
#define STDMETHODV(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODVCALLTYPE method
|
||||
#define STDMETHODV_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODVCALLTYPE method
|
||||
|
||||
#define PURE = 0
|
||||
#define THIS_
|
||||
|
|
|
@ -76,6 +76,16 @@ extern "C" {
|
|||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef DECLSPEC_NOTHROW
|
||||
# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS)
|
||||
# define DECLSPEC_NOTHROW __declspec(nothrow)
|
||||
# elif defined(__GNUC__)
|
||||
# define DECLSPEC_NOTHROW __attribute__((nothrow))
|
||||
# else
|
||||
# define DECLSPEC_NOTHROW
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef DECLSPEC_CACHEALIGN
|
||||
# define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(128)
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue