From 2ead571fb6e06b90053b0ee920505fd589b229aa Mon Sep 17 00:00:00 2001 From: "decurtis@webrtc.org" Date: Thu, 8 Jan 2015 19:18:01 +0000 Subject: [PATCH] Hard define the GUID for AudioEndpoint to avoid conflicts during compile. BUG=3996 R=juberti@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36649004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8026 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/devices/win32devicemanager.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/talk/media/devices/win32devicemanager.cc b/talk/media/devices/win32devicemanager.cc index 668270efd1..1b9e9d86f6 100644 --- a/talk/media/devices/win32devicemanager.cc +++ b/talk/media/devices/win32devicemanager.cc @@ -32,12 +32,22 @@ #include // must come before ks.h #include #include -#define INITGUID // For PKEY_AudioEndpoint_GUID #include #include #include #include +// PKEY_AudioEndpoint_GUID isn't included in uuid.lib and we don't want +// to define INITGUID in order to define all the uuids in this object file +// as it will conflict with uuid.lib (multiply defined symbols). +// So our workaround is to define this one missing symbol here manually. +// See: https://code.google.com/p/webrtc/issues/detail?id=3996 +EXTERN_C const PROPERTYKEY PKEY_AudioEndpoint_GUID = { { + 0x1da5d803, 0xd492, 0x4edd, { + 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e + } }, 4 +}; + #include "webrtc/base/logging.h" #include "webrtc/base/stringutils.h" #include "webrtc/base/thread.h"