From ea4dc61d38582fb659cfd8b9c8c9a654ca2e245c Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 20 Aug 2011 12:31:37 +0000
Subject: [PATCH] [WIN32K] Fix amd64 build

svn path=/trunk/; revision=53338
---
 reactos/subsystems/win32/win32k/main/dllmain.c   | 2 ++
 reactos/subsystems/win32/win32k/objects/dclife.c | 7 +++++++
 reactos/subsystems/win32/win32k/objects/gdiobj.c | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c
index 39e387fb8e6..e788bbec8ac 100644
--- a/reactos/subsystems/win32/win32k/main/dllmain.c
+++ b/reactos/subsystems/win32/win32k/main/dllmain.c
@@ -480,7 +480,9 @@ Win32kInitWin32Thread(PETHREAD Thread)
     return(STATUS_SUCCESS);
 }
 
+#ifdef _M_IX86
 C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE);
+#endif
 
 // Return on failure
 #define NT_ROF(x) \
diff --git a/reactos/subsystems/win32/win32k/objects/dclife.c b/reactos/subsystems/win32/win32k/objects/dclife.c
index 6b66f8c632d..421be24f4f8 100644
--- a/reactos/subsystems/win32/win32k/objects/dclife.c
+++ b/reactos/subsystems/win32/win32k/objects/dclife.c
@@ -19,10 +19,17 @@ PSURFACE psurfDefaultBitmap = NULL;
 PBRUSH pbrDefaultBrush = NULL;
 
 // FIXME: these should go to floatobj.h or something
+#ifdef _M_IX86
 #define FLOATOBJ_0 {0x00000000, 0x00000000}
 #define FLOATOBJ_1 {0x40000000, 0x00000002}
 #define FLOATOBJ_16 {0x40000000, 0x00000006}
 #define FLOATOBJ_1_16 {0x40000000, 0xfffffffe}
+#else
+#define FLOATOBJ_0 0.
+#define FLOATOBJ_1 1.
+#define FLOATOBJ_16 16.
+#define FLOATOBJ_1_16 (1./16.)
+#endif
 
 static const FLOATOBJ gef0 = FLOATOBJ_0;
 static const FLOATOBJ gef1 = FLOATOBJ_1;
diff --git a/reactos/subsystems/win32/win32k/objects/gdiobj.c b/reactos/subsystems/win32/win32k/objects/gdiobj.c
index 2a5597ecf66..2f0d6abc67b 100644
--- a/reactos/subsystems/win32/win32k/objects/gdiobj.c
+++ b/reactos/subsystems/win32/win32k/objects/gdiobj.c
@@ -62,7 +62,7 @@
 
 #define MmMapViewInSessionSpace MmMapViewInSystemSpace
 
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
 #define InterlockedOr16 _InterlockedOr16
 #endif