ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved some of the STDMETHOD/STDAPI to winnt.h. 

Moved the EXTERN_C macro to winnt.h.
Added a '#ifndef __WINE__' around the remaining macros.
This commit is contained in:
François Gouget 2000-12-19 02:09:52 +00:00 committed by Alexandre Julliard
parent 174664a251
commit 42b3ee74be
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/objbase.h
View File

@ -36,37 +36,13 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid);
} }
#endif #endif
#ifndef __WINE__
/* These macros are msdev's way of defining COM objects. They are provided /* These macros are msdev's way of defining COM objects.
* here for use by winelib users. * They are provided here for use by Winelib developpers.
*/ */
#ifdef __cplusplus
#define EXTERN_C extern "C"
#else
#define EXTERN_C extern
#endif
#define STDMETHODCALLTYPE __stdcall
#define STDMETHODVCALLTYPE __cdecl
#define STDAPICALLTYPE __stdcall
#define STDAPIVCALLTYPE __cdecl
#define FARSTRUCT #define FARSTRUCT
#define HUGEP #define HUGEP
#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE
#define STDMETHODIMP HRESULT STDMETHODCALLTYPE
#define STDMETHODIMP_(type) type STDMETHODCALLTYPE
#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE
#define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE
#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
#define STDMETHODIMPV_(type) type STDMETHODVCALLTYPE
#define WINOLEAPI STDAPI #define WINOLEAPI STDAPI
#define WINOLEAPI_(type) STDAPI_(type) #define WINOLEAPI_(type) STDAPI_(type)
@ -112,6 +88,8 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid);
#define BEGIN_INTERFACE #define BEGIN_INTERFACE
#define END_INTERFACE #define END_INTERFACE
#endif #endif /* __cplusplus && !CINTERFACE */
#endif /* __WINE__ */
#endif /* __WINE_OBJBASE_H */ #endif /* __WINE_OBJBASE_H */

24
include/winnt.h
View File

@ -196,6 +196,30 @@ typedef double DATE;
/**** winnt.h proper *****/ /**** winnt.h proper *****/
/* Microsoft's macros for declaring functions */
#ifdef __cplusplus
# define EXTERN_C extern "C"
#else
# define EXTERN_C extern
#endif
#ifndef __WINE__
#define STDMETHODCALLTYPE __stdcall
#define STDMETHODVCALLTYPE __cdecl
#define STDAPICALLTYPE __stdcall
#define STDAPIVCALLTYPE __cdecl
#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE
#define STDMETHODIMP HRESULT STDMETHODCALLTYPE
#define STDMETHODIMP_(type) type STDMETHODCALLTYPE
#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE
#define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE
#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
#define STDMETHODIMPV_(type) type STDMETHODVCALLTYPE
#endif
/* Define the basic types */ /* Define the basic types */
#ifndef VOID #ifndef VOID
#define VOID void #define VOID void