From b2b224b52721b55faffbb9e6c643556bbd5e90ad Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 20 Dec 2014 16:26:03 +0000 Subject: [PATCH] [PSDK] Define rpcndr.h DECLSPEC_UUID in consistency with the one in winnt.h. Fixes some redefinition warnings. svn path=/trunk/; revision=65762 --- reactos/include/psdk/rpcndr.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/reactos/include/psdk/rpcndr.h b/reactos/include/psdk/rpcndr.h index ca8f4f75501..52f419bef61 100644 --- a/reactos/include/psdk/rpcndr.h +++ b/reactos/include/psdk/rpcndr.h @@ -142,7 +142,14 @@ typedef void (__RPC_USER *NDR_RUNDOWN)(void *context); typedef void (__RPC_USER *NDR_NOTIFY_ROUTINE)(void); typedef void (__RPC_USER *NDR_NOTIFY2_ROUTINE)(boolean flag); -#define DECLSPEC_UUID(x) +#ifndef DECLSPEC_UUID + #if defined(_MSC_VER) && defined(__cplusplus) + #define DECLSPEC_UUID(x) __declspec(uuid(x)) + #else + #define DECLSPEC_UUID(x) + #endif +#endif /* DECLSPEC_UUID */ + #define MIDL_INTERFACE(x) struct struct _MIDL_STUB_MESSAGE;