2009-04-04  Ozkan Sezer <sezeroz@gmail.com>

	* d3dtypes.h: Change long to LONG for Win64 compatibility.
	(wine git 3d94f5efc29b43c72e9574ca6c7ee88a69e28b73)



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@714 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/direct-x/ChangeLog

diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog
index 0174d4d..87b35de 100644
--- a/mingw-w64-headers/direct-x/ChangeLog
+++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -20,6 +20,8 @@
 	(wine git e169bb0a7f204ebe0f3053d824a1177bc1dedc65) and
 	for IDirect3DViewport3_GetViewport (wine git 
 		  7c8fa9c24f5d6d4e22dec148ffecefc9a4262a27)
+	* d3dtypes.h: Change long to LONG for Win64 compatibility.
+	(wine git 3d94f5efc29b43c72e9574ca6c7ee88a69e28b73)
 
 2009-02-20  Kai Tietz  <kai.tietz@onevision.com>
 

mingw-w64-headers/direct-x/include/d3dtypes.h

diff --git a/mingw-w64-headers/direct-x/include/d3dtypes.h b/mingw-w64-headers/direct-x/include/d3dtypes.h
index 5ee2260..a1d33a9 100644
--- a/mingw-w64-headers/direct-x/include/d3dtypes.h
+++ b/mingw-w64-headers/direct-x/include/d3dtypes.h
@@ -71,10 +71,10 @@
 #define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
 
 #define D3DRGB(r, g, b) \
-    (0xff000000L | ( ((long)((r) * 255)) << 16) | (((long)((g) * 255)) << 8) | (long)((b) * 255))
+    (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255))
 #define D3DRGBA(r, g, b, a) \
-    (   (((long)((a) * 255)) << 24) | (((long)((r) * 255)) << 16) \
-    |   (((long)((g) * 255)) << 8) | (long)((b) * 255) \
+    (   (((LONG)((a) * 255)) << 24) | (((LONG)((r) * 255)) << 16) \
+    |   (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255) \
     )
 
 #define RGB_GETRED(rgb)         (((rgb) >> 16) & 0xff)