Skip to content

W
wine-cw
Commit 4a1f1082 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

include: Use Mingw64's __uuidof when present.

otherwise Wine's and Mingw64's __uuidof() conflict (C++) Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 61bc8abd
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
include/guiddef.h
View file @ 4a1f1082
...@@ -44,7 +44,10 @@ typedef struct _GUID ...@@ -44,7 +44,10 @@ typedef struct _GUID
/* Macros for __uuidof emulation */ /* Macros for __uuidof emulation */
#ifdef __cplusplus #ifdef __cplusplus
# if defined(__MINGW32__) # if defined(__MINGW32__)
# define __WINE_UUID_ATTR __attribute__((selectany)) # if !defined(__uuidof) /* Mingw64 can provide support for __uuidof and __CRT_UUID_DECL */
# define __WINE_UUID_ATTR __attribute__((selectany))
# undef __CRT_UUID_DECL
# endif
# elif defined(__GNUC__) # elif defined(__GNUC__)
# define __WINE_UUID_ATTR __attribute__((visibility("hidden"),weak)) # define __WINE_UUID_ATTR __attribute__((visibility("hidden"),weak))
# endif # endif
...@@ -76,7 +79,7 @@ extern "C++" { ...@@ -76,7 +79,7 @@ extern "C++" {
#define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid #define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid
#else /* __WINE_UUID_ATTR */ #elif !defined(__CRT_UUID_DECL)
#define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment