From 7b33e2b91ccf44a39490b854e7147af4a3b82b64 Mon Sep 17 00:00:00 2001
From: Juergen Schmied <juergen.schmied@metronet.de>
Date: Sat, 23 Jan 1999 14:06:44 +0000
Subject: [PATCH] Moved the instance creation of GUID's to a new file. Size of
 compobj.o goes down to 1/3; should prevent more sig11's.

---
 ole/Makefile.in |  1 +
 ole/compobj.c   | 17 +----------------
 ole/guid.c      | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 ole/guid.c

diff --git a/ole/Makefile.in b/ole/Makefile.in
index f14344e9523..2d4adc323b3 100644
--- a/ole/Makefile.in
+++ b/ole/Makefile.in
@@ -7,6 +7,7 @@ MODULE    = ole
 
 C_SRCS = \
 	compobj.c \
+	guid.c \
 	ifs.c \
 	moniker.c \
 	ole2.c \
diff --git a/ole/compobj.c b/ole/compobj.c
index a5349947d2e..a4f1ef523d8 100644
--- a/ole/compobj.c
+++ b/ole/compobj.c
@@ -27,12 +27,12 @@
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include "windows.h"
 #include "winerror.h"
+#include "ole.h"
 #include "ole2.h"
 #include "debug.h"
 #include "file.h"
@@ -40,21 +40,6 @@
 #include "ldt.h"
 #include "winreg.h"
 
-#define INITGUID
-
-/* FIXME: we include all the header files containing GUIDs 
- * so that the corresponding variables get defined. But they 
- * don't even all belong to the same DLL !!!
- */
-#include "objbase.h"
-#include "servprov.h"
-#include "shlobj.h"
-#include "ddraw.h"
-#include "d3d.h"
-#include "dinput.h"
-#include "dsound.h"
-#include "dplay.h"
-
 #include "objbase.h"
 
 LPMALLOC16 currentMalloc16=NULL;
diff --git a/ole/guid.c b/ole/guid.c
new file mode 100644
index 00000000000..5de3c108e94
--- /dev/null
+++ b/ole/guid.c
@@ -0,0 +1,19 @@
+#ifndef __guid_h_
+#define __guid_h_
+
+#define INITGUID
+
+/* FIXME: we include all the header files containing GUIDs
+ * so that the corresponding variables get defined. But they
+ * don't even all belong to the same DLL !!!
+ */
+#include "oleobj.h"
+#include "objbase.h"
+#include "servprov.h"
+#include "ddraw.h"
+#include "d3d.h"
+#include "dinput.h"
+#include "dsound.h"
+#include "dplay.h"
+
+#endif
-- 
2.11.4.GIT