1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
DEP: 3
Subject: Removes incompatible typedefs for amd64 builds
Last-Update: 2012-09-20
Origin: http://code.google.com/p/nvidia-texture-tools/issues/detail?id=175
Bug: https://launchpadlibrarian.net/115652507/buildlog_ubuntu-quantal-amd64.nvidia-texture-tools_2.0.8-1%2Bdfsg-2build1_FAILEDTOBUILD.txt.gz
diff --git a/src/nvcore/DefsGnucLinux.h b/src/nvcore/DefsGnucLinux.h
index a8e2a29..84864cc 100644
--- a/src/nvcore/DefsGnucLinux.h
+++ b/src/nvcore/DefsGnucLinux.h
@@ -2,6 +2,8 @@
#error "Do not include this file directly."
#endif
+#include <bits/wordsize.h>
+
// Function linkage
#define DLL_IMPORT
#if __GNUC__ >= 4
@@ -58,8 +60,13 @@ typedef signed short int16;
typedef unsigned int uint32;
typedef signed int int32;
+#if __WORDSIZE == 32
typedef unsigned long long uint64;
typedef signed long long int64;
+#else
+typedef unsigned long uint64;
+typedef signed long int64;
+#endif
// Aliases
typedef uint32 uint;
|
