Jacek Caban : guiddef.h: Remove GUID_NULL declaration.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c041605b0074e6b12e5ea1df0cc645e772a220a7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c041605b0074e6b12e5ea1df0...

Author: Jacek Caban 
Date:   Tue Feb  4 15:21:11 2020 +0100

guiddef.h: Remove GUID_NULL declaration.

It's declared in cguid.h with proper extern "C".

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/msxml3/tests/schema.c      | 1 +
 dlls/rpcrt4/ndr_contexthandle.c | 1 +
 dlls/setupapi/devinst.c         | 1 +
 dlls/setupapi/tests/devinst.c   | 1 +
 include/guiddef.h               | 2 --
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c
index 0fcaf757b2..4637d62f8b 100644
--- a/dlls/msxml3/tests/schema.c
+++ b/dlls/msxml3/tests/schema.c
@@ -30,6 +30,7 @@
 #undef CLSID_DOMDocument
 #include "msxml2did.h"
 #include "dispex.h"
+#include "cguid.h"

#include "wine/test.h"

diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c
index 848d924e97..36deb41d81 100644
--- a/dlls/rpcrt4/ndr_contexthandle.c
+++ b/dlls/rpcrt4/ndr_contexthandle.c
@@ -22,6 +22,7 @@
 #include "ndr_misc.h"
 #include "rpc_assoc.h"
 #include "rpcndr.h"
+#include "cguid.h"

#include "wine/debug.h"
 #include "wine/list.h"
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index f8a4e93efc..0840341b7d 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -37,6 +37,7 @@
 #include "winioctl.h"
 #include "rpc.h"
 #include "rpcdce.h"
+#include "cguid.h"

#include "setupapi_private.h"

diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index a02752d2de..b887bd8977 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -31,6 +31,7 @@
 #include "devpkey.h"
 #include "setupapi.h"
 #include "cfgmgr32.h"
+#include "cguid.h"

#include "wine/heap.h"
 #include "wine/test.h"
diff --git a/include/guiddef.h b/include/guiddef.h
index ba39dd87b4..cc26e8b3a5 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -167,6 +167,4 @@ inline bool operator!=(const GUID& guidOne, const GUID& guidOther)
 }
 #endif

-extern const IID GUID_NULL;
-
 #endif /* _GUIDDEF_H_ */