[ros-diffs] [tkreuzer] 53338: [WIN32K] Fix amd64 build

Author: tkreuzer
Date: Sat Aug 20 12:31:37 2011
New Revision: 53338

URL: http://svn.reactos.org/svn/reactos?rev=53338&view=rev
Log:
[WIN32K]
Fix amd64 build

Modified:
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/subsystems/win32/win32k/objects/dclife.c
    trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat Aug 20 12:31:37
2011
@@ -480,7 +480,9 @@
     return(STATUS_SUCCESS);
 }
 
+#ifdef _M_IX86
 C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE);
+#endif
 
 // Return on failure
 #define NT_ROF(x) \

Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat Aug 20
12:31:37 2011
@@ -19,10 +19,17 @@
 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;

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat Aug 20
12:31:37 2011
@@ -62,7 +62,7 @@
 
 #define MmMapViewInSessionSpace MmMapViewInSystemSpace
 
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
 #define InterlockedOr16 _InterlockedOr16
 #endif