Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-01 02:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PSDK] Fix GCC8 complaining on duplicate and wrong declarations

Browse source
This commit is contained in:
Victor Perevertkin 2019-08-17 23:08:22 +03:00
parent 1c0a2a35e7
commit bda22774a7
3 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
sdk/include/psdk/cguid.h
View file

@ -19,33 +19,39 @@
#ifndef __CGUID_H__
#define __CGUID_H__
#if __GNUC__ >= 8
#define GCC8DECLSPEC_SELECTANY DECLSPEC_SELECTANY
#else
#define GCC8DECLSPEC_SELECTANY
#endif
#ifdef __cplusplus
extern "C" {
#endif
extern const IID GUID_NULL;
extern const IID IID_IRpcChannel;
extern const IID IID_IRpcStub;
extern const IID IID_IStubManager;
extern const IID IID_IRpcProxy;
extern const IID IID_IProxyManager;
extern const IID IID_IPSFactory;
extern const IID IID_IInternalMoniker;
extern const IID IID_IDfReserved1;
extern const IID IID_IDfReserved2;
extern const IID IID_IDfReserved3;
extern const IID GCC8DECLSPEC_SELECTANY GUID_NULL;
extern const IID GCC8DECLSPEC_SELECTANY IID_IRpcChannel;
extern const IID GCC8DECLSPEC_SELECTANY IID_IRpcStub;
extern const IID GCC8DECLSPEC_SELECTANY IID_IStubManager;
extern const IID GCC8DECLSPEC_SELECTANY IID_IRpcProxy;
extern const IID GCC8DECLSPEC_SELECTANY IID_IProxyManager;
extern const IID GCC8DECLSPEC_SELECTANY IID_IPSFactory;
extern const IID GCC8DECLSPEC_SELECTANY IID_IInternalMoniker;
extern const IID GCC8DECLSPEC_SELECTANY IID_IDfReserved1;
extern const IID GCC8DECLSPEC_SELECTANY IID_IDfReserved2;
extern const IID GCC8DECLSPEC_SELECTANY IID_IDfReserved3;
extern const CLSID CLSID_StdMarshal;
extern const CLSID CLSID_AggStdMarshal;
extern const CLSID CLSID_StdAsyncActManager;
extern const IID IID_IStub;
extern const IID IID_IProxy;
extern const IID IID_IEnumGeneric;
extern const IID IID_IEnumHolder;
extern const IID IID_IEnumCallback;
extern const IID IID_IOleManager;
extern const IID IID_IOlePresObj;
extern const IID IID_IDebug;
extern const IID IID_IDebugStream;
extern const IID GCC8DECLSPEC_SELECTANY IID_IStub;
extern const IID GCC8DECLSPEC_SELECTANY IID_IProxy;
extern const IID GCC8DECLSPEC_SELECTANY IID_IEnumGeneric;
extern const IID GCC8DECLSPEC_SELECTANY IID_IEnumHolder;
extern const IID GCC8DECLSPEC_SELECTANY IID_IEnumCallback;
extern const IID GCC8DECLSPEC_SELECTANY IID_IOleManager;
extern const IID GCC8DECLSPEC_SELECTANY IID_IOlePresObj;
extern const IID GCC8DECLSPEC_SELECTANY IID_IDebug;
extern const IID GCC8DECLSPEC_SELECTANY IID_IDebugStream;
extern const CLSID CLSID_PSGenObject;
extern const CLSID CLSID_PSClientSite;
extern const CLSID CLSID_PSClassObject;

2
sdk/include/psdk/docobj.idl
View file

@ -419,4 +419,4 @@ cpp_quote("#define IID_IMsoView IID_IOleDocumentView")
cpp_quote("#define IID_IEnumMsoView IID_IEnumOleDocumentViews")
cpp_quote("#define IID_IMsoCommandTarget IID_IOleCommandTarget")
cpp_quote("EXTERN_C const GUID SID_SContainerDispatch;")
cpp_quote("DEFINE_GUID(SID_SContainerDispatch, 0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);")

4
sdk/include/psdk/mswsockdef.h
View file

@ -21,7 +21,7 @@ extern "C" {
#ifdef _WS2DEF_
extern CONST UCHAR sockaddr_size[AF_MAX];
const UCHAR sockaddr_size[AF_MAX];
MSWSOCKDEF_INLINE
UCHAR
@ -53,7 +53,7 @@ typedef enum _WSA_COMPATIBILITY_BEHAVIOR_ID {
typedef struct _WSA_COMPATIBILITY_MODE {
WSA_COMPATIBILITY_BEHAVIOR_ID BehaviorId;
ULONG TargetOsVersion;
} WSA_COMPATIBILITY_MODE, *PWSA_COMPATIBILITY_MODE;
} WSA_COMPATIBILITY_MODE, *PWSA_COMPATIBILITY_MODE;
#endif /* (_WIN32_WINNT>=0x0600) */