[NTOSKRNL]

Don't include initguid.h in a global header. It causes the guids to be generated in every object file, using 16 bytes per guid. We were lucky that the linker seemed to detect duplicates, so that the resulting image size isn't affected. Add a new file guid.c, that only contains the guids.

svn path=/branches/cmake-bringup/; revision=49708

diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt
index 92dd29c..ae4148c 100644 (file)
--- a/ntoskrnl/CMakeLists.txt
+++ b/ntoskrnl/CMakeLists.txt
@@ -215,6 +215,7 @@ list(APPEND SOURCE
     ob/obsecure.c
     ob/obwait.c
     po/events.c
+    po/guid.c
     po/poshtdwn.c
     po/povolume.c
     po/power.c

diff --git a/ntoskrnl/include/internal/po.h b/ntoskrnl/include/internal/po.h
index ef4ee1a..86e2559 100644 (file)
--- a/ntoskrnl/include/internal/po.h
+++ b/ntoskrnl/include/internal/po.h
@@ -6,7 +6,7 @@
 * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
 */
 
-#include "initguid.h"
+#include <guiddef.h>
 #include <poclass.h>
 
 //

diff --git a/ntoskrnl/po/guid.c b/ntoskrnl/po/guid.c
new file mode 100644 (file)
index 0000000..a3ec319
--- /dev/null
+++ b/ntoskrnl/po/guid.c
@@ -0,0 +1,4 @@
+
+#include <wdm.h>
+#include <initguid.h>
+#include <poclass.h>