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.

Moved the instance creation of GUID's to a new file.
7b33e2b9 · Juergen Schmied · Alexandre Julliard · f072fc97 · 7b33e2b9 · 7b33e2b9
Commit 7b33e2b9 authored Jan 23, 1999 by Juergen Schmied Committed by Alexandre Julliard Jan 23, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 16 deletions

Makefile.in ole/Makefile.in +1 -0

compobj.c ole/compobj.c +1 -16

guid.c ole/guid.c +19 -0

No files found.
--- 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 \

--- 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;

--- a/ole/guid.c
+++ b/ole/guid.c
+#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