[ros-diffs] [reactos] 01/01: Revert "[DXG] Define GUIDs only once", to fix MSVC build

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c4d21a5a1c4e2e533d9d…

commit 0c4d21a5a1c4e2e533d9df43969a9c8ec88ecb94
Author:     Hervé Poussineau <hpoussin(a)reactos.org>
AuthorDate: Mon Apr 1 18:00:59 2019 +0200
Commit:     Hervé Poussineau <hpoussin(a)reactos.org>
CommitDate: Mon Apr 1 18:00:59 2019 +0200

    Revert "[DXG] Define GUIDs only once", to fix MSVC build
    
    This reverts commit 3a78dd4b3158cd535d561e7a95fbb55863a1a669.
---
 win32ss/reactx/dxg/dxg_int.h |  1 +
 win32ss/reactx/dxg/main.c    | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/win32ss/reactx/dxg/dxg_int.h b/win32ss/reactx/dxg/dxg_int.h
index b2dd3b7d4d..fa9c3170a8 100644
--- a/win32ss/reactx/dxg/dxg_int.h
+++ b/win32ss/reactx/dxg/dxg_int.h
@@ -19,6 +19,7 @@
 #include <wingdi.h>
 #include <winddi.h>
 #include <ddkernel.h>
+#include <initguid.h>
 #include <ddrawi.h>
 #include <ntgdityp.h>
 #include <psfuncs.h>
diff --git a/win32ss/reactx/dxg/main.c b/win32ss/reactx/dxg/main.c
index deeb49260c..7bcd329b9e 100644
--- a/win32ss/reactx/dxg/main.c
+++ b/win32ss/reactx/dxg/main.c
@@ -8,20 +8,6 @@
  *       15/10-2007   Magnus Olsen
  */
 
-#include <ntifs.h>
-
-/* Win32 Headers */
-#define WINBASEAPI
-#define STARTF_USESIZE 2
-#define STARTF_USEPOSITION 4
-#define INTERNAL_CALL NTAPI
-#define NT_BUILD_ENVIRONMENT
-
-#include <windef.h>
-#include <winerror.h>
-#include <wingdi.h>
-#include <winddi.h>
-#include <initguid.h>
 #include <dxg_int.h>
 #include "dxg_driver.h"