[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37093] trunk/lib/win64/wintab/INCLUDE/ wintab.h: The same compilation error fix as in with 32bit wintab file:

[Sergey Sharybin]

Revision: 37093
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37093
Author:   nazgul
Date:     2011-06-02 09:21:41 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
The same compilation error fix as in with 32bit wintab file:
rename macro INT to INTEGRAL.

Modified Paths:
--------------
    trunk/lib/win64/wintab/INCLUDE/wintab.h

Modified: trunk/lib/win64/wintab/INCLUDE/wintab.h
===================================================================
--- trunk/lib/win64/wintab/INCLUDE/wintab.h	2011-06-02 09:04:07 UTC (rev 37092)
+++ trunk/lib/win64/wintab/INCLUDE/wintab.h	2011-06-02 09:21:41 UTC (rev 37093)
@@ -81,18 +81,18 @@
 typedef DWORD FIX32;				/* fixed-point arithmetic type */
 
 #ifndef NOFIX32
-	#define INT(x)	HIWORD(x)
+	#define INTEGRAL(x)	HIWORD(x)
 	#define FRAC(x)	LOWORD(x)
 
 	#define CASTFIX32(x)	((FIX32)((x)*65536L))
 
-	#define ROUND(x)		(INT(x) + (FRAC(x) > (WORD)0x8000))
+	#define ROUND(x)		(INTEGRAL(x) + (FRAC(x) > (WORD)0x8000))
 
 	#define FIX_MUL(c, a, b)						\
 		(c = (((DWORD)FRAC(a) * FRAC(b)) >> 16) +	\
-			(DWORD)INT(a) * FRAC(b) +				\
-			(DWORD)INT(b) * FRAC(a) +				\
-			((DWORD)INT(a) * INT(b) << 16))
+			(DWORD)INTEGRAL(a) * FRAC(b) +				\
+			(DWORD)INTEGRAL(b) * FRAC(a) +				\
+			((DWORD)INTEGRAL(a) * INTEGRAL(b) << 16))
 
 	#ifdef _WINDLL
 		#define FIX_DIV_SC static
@@ -108,7 +108,7 @@
 			temp = ((a / b) << 16);				\
 			rem = a % b;			   			\
 			btemp = b;							\
-			if (INT(btemp) < 256) {				\
+			if (INTEGRAL(btemp) < 256) {				\
 				rem <<= 8;				   		\
 			}									\
 			else {								\