[Csp-commits] svn:csp r1363 - in trunk/CSP/SimData: . Include/SimData

[<sv...@ww...>]

Author: mkrose
Date: 2004-12-06 21:10:10 -0800 (Mon, 06 Dec 2004)
New Revision: 1363

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/Uniform.h
Log:
Define correct 64-bit integer suffixes for msvc.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1363

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-12-07 04:43:46 UTC (rev 1362)
+++ trunk/CSP/SimData/CHANGES.current	2004-12-07 05:10:10 UTC (rev 1363)
@@ -1,6 +1,9 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2004-12-06: onsight
+ * Define correct 64-bit integer suffixes for msvc.
+
 2004-12-05: onsight
  * Fix a couple minor warnings under msvc.
  * Removed deprecated "default" data archive feature.

Modified: trunk/CSP/SimData/Include/SimData/Uniform.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/Uniform.h	2004-12-07 04:43:46 UTC (rev 1362)
+++ trunk/CSP/SimData/Include/SimData/Uniform.h	2004-12-07 05:10:10 UTC (rev 1363)
@@ -70,8 +70,8 @@
 # define SIMDATA_PACKED
 typedef __int64 int64;
 typedef unsigned __int64 uint64;
-# define SIMDATA_ULL(x) x
-# define SIMDATA_LL(x) x
+# define SIMDATA_ULL(x) x##ull
+# define SIMDATA_LL(x) x##ll
 #else
 # define SIMDATA_STATIC_CONST_DEF(x) const x
 # define SIMDATA_PACKED __attribute__((packed))