Added/fixed missing extern "C".

This commit is contained in:
Francois Gouget 2000-10-19 20:32:18 +00:00 committed by Alexandre Julliard
parent db92536cfd
commit 0062892c66
5 changed files with 36 additions and 10 deletions

View File

@ -26,8 +26,16 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
HRESULT WINAPI GetClassFile(LPOLESTR filePathName,CLSID *pclsid); HRESULT WINAPI GetClassFile(LPOLESTR filePathName,CLSID *pclsid);
#ifdef __cplusplus
}
#endif
/* These macros are msdev's way of defining COM objects. They are provided /* These macros are msdev's way of defining COM objects. They are provided
* here for use by winelib users. * here for use by winelib users.

View File

@ -516,10 +516,6 @@ HRESULT WINAPI VarCmp(LPVARIANT,LPVARIANT,LCID,ULONG);
#ifdef __cplusplus
} /* extern "C" */
#endif
typedef struct tagPARAMDATA { typedef struct tagPARAMDATA {
OLECHAR * szName; /* parameter name */ OLECHAR * szName; /* parameter name */
VARTYPE vt; /* parameter type */ VARTYPE vt; /* parameter type */
@ -585,5 +581,9 @@ HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR);
HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*); HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*);
HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND); HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /*__WINE_OLEAUTO_H*/ #endif /*__WINE_OLEAUTO_H*/

View File

@ -4,6 +4,11 @@
#include "windef.h" #include "windef.h"
#include "ocidl.h" #include "ocidl.h"
#ifdef __cplusplus
extern "C" {
#endif
/* /*
* Ole Control Interfaces * Ole Control Interfaces
@ -256,6 +261,13 @@ HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
#define CONNECT_E_CANNOTCONNECT (CONNECT_E_FIRST+2) #define CONNECT_E_CANNOTCONNECT (CONNECT_E_FIRST+2)
#define CONNECT_E_OVERRIDDEN (CONNECT_E_FIRST+3) #define CONNECT_E_OVERRIDDEN (CONNECT_E_FIRST+3)
#define SELFREG_E_FIRST MAKE_SCODE(SEVERITY_ERROR, FACILITY_ITF, 0x0200)
#define SELFREG_E_LAST MAKE_SCODE(SEVERITY_ERROR, FACILITY_ITF, 0x020F)
#define SELFREG_S_FIRST MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_ITF, 0x0200)
#define SELFREG_S_LAST MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_ITF, 0x020F)
#define SELFREG_E_TYPELIB (SELFREG_E_FIRST+0)
#define SELFREG_E_CLASS (SELFREG_E_FIRST+1)
#ifndef FACILITY_CONTROL #ifndef FACILITY_CONTROL
#define FACILITY_CONTROL 0xa #define FACILITY_CONTROL 0xa
#endif #endif
@ -315,6 +327,11 @@ HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
#define PERPROP_E_NOPAGEAVAILABLE (PERPROP_E_FIRST+0) #define PERPROP_E_NOPAGEAVAILABLE (PERPROP_E_FIRST+0)
#ifdef __cplusplus
}
#endif
#endif /* __WINE_OLECTL_H */ #endif /* __WINE_OLECTL_H */

View File

@ -34,6 +34,11 @@
#include "wtypes.h" #include "wtypes.h"
#include "guiddef.h" #include "guiddef.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef NONAMELESSSTRUCT #ifndef NONAMELESSSTRUCT
#define LISet32(li, v) ((li).HighPart = (v) < 0 ? -1 : 0, (li).LowPart = (v)) #define LISet32(li, v) ((li).HighPart = (v) < 0 ? -1 : 0, (li).LowPart = (v))
#define ULISet32(li, v) ((li).HighPart = 0, (li).LowPart = (v)) #define ULISet32(li, v) ((li).HighPart = 0, (li).LowPart = (v))
@ -661,10 +666,6 @@ ICOM_DEFINE(IMalloc,IUnknown)
#define IMalloc_HeapMinimize(p) ICOM_CALL (HeapMinimize,p) #define IMalloc_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
#ifdef __cplusplus
extern "C" {
#endif
HRESULT WINAPI CoGetMalloc(DWORD dwMemContext,LPMALLOC* lpMalloc); HRESULT WINAPI CoGetMalloc(DWORD dwMemContext,LPMALLOC* lpMalloc);
LPVOID WINAPI CoTaskMemAlloc(ULONG size); LPVOID WINAPI CoTaskMemAlloc(ULONG size);

View File

@ -1,7 +1,7 @@
#ifndef _WINE_WININET_H_ #ifndef _WINE_WININET_H_
#define _WINE_WININET_H_ #define _WINE_WININET_H_
#if defined(__cplusplus) #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -1399,7 +1399,7 @@ BOOLAPI InternetCheckConnectionA(LPCSTR lpszUrl,DWORD dwFlags,DWORD dwReserved);
BOOLAPI InternetCheckConnectionW(LPCWSTR lpszUrl,DWORD dwFlags,DWORD dwReserved); BOOLAPI InternetCheckConnectionW(LPCWSTR lpszUrl,DWORD dwFlags,DWORD dwReserved);
#define InternetCheckConnection WINELIB_NAME_AW(InternetCheckConnection) #define InternetCheckConnection WINELIB_NAME_AW(InternetCheckConnection)
#if defined(__cplusplus) #ifdef __cplusplus
} }
#endif #endif