From: Martin Ling <redacted>
Date: Wed, 24 Sep 2014 19:53:03 +0000 (+0100)
Subject: windows: Fix compile issues with multiply or not defined GUIDs.
X-Git-Tag: libserialport-0.1.1~93
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=78940e69219b6d9aee747bac0677b738531a089d;p=libserialport.git

windows: Fix compile issues with multiply or not defined GUIDs.

This fixes bug #416.
---

diff --git a/libserialport_internal.h b/libserialport_internal.h
index 031ffef..8ef8376 100644
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -32,12 +32,13 @@
 #include <stdio.h>
 #include <stdarg.h>
 #ifdef _WIN32
-#include <initguid.h>
-
 #include <windows.h>
 #include <tchar.h>
 #include <setupapi.h>
 #include <cfgmgr32.h>
+#undef DEFINE_GUID
+#define DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+	static const GUID name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } }
 #include <usbioctl.h>
 #include <usbiodef.h>
 #else