author | markwright |
Sun, 06 Jun 2010 10:37:12 +0000 | |
changeset 2760 | 6102b8653c96 |
permissions | -rw-r--r-- |
2760 | 1 |
--- otp_src_R13B04-orig/lib/wx/c_src/wxe_gl.h 2009-03-12 12:25:43.000000000 +0000 |
2 |
+++ otp_src_R13B04/lib/wx/c_src/wxe_gl.h 2010-06-06 05:16:12.457404922 +0000 |
|
3 |
@@ -98,20 +98,20 @@ |
|
4 |
#include <inttypes.h> |
|
5 |
#elif defined(__sun__) |
|
6 |
#include <inttypes.h> |
|
7 |
-#if defined(__STDC__) |
|
8 |
+#if defined(__STDC__) && !defined(_INT64_TYPE) |
|
9 |
#if defined(__arch64__) |
|
10 |
typedef long int int64_t; |
|
11 |
typedef unsigned long int uint64_t; |
|
12 |
#else |
|
13 |
typedef long long int int64_t; |
|
14 |
typedef unsigned long long int uint64_t; |
|
15 |
-#endif /* __arch64__ */ |
|
16 |
+#endif /* __arch64__ && !_INT64_TYPE */ |
|
17 |
#endif /* __STDC__ */ |
|
18 |
-#elif defined( __VMS ) |
|
19 |
+#elif defined( __VMS ) || defined(__SOL64__) |
|
20 |
#include <inttypes.h> |
|
21 |
#elif defined(__SCO__) || defined(__USLC__) |
|
22 |
#include <stdint.h> |
|
23 |
-#elif defined(__UNIXOS2__) || defined(__SOL64__) |
|
24 |
+#elif defined(__UNIXOS2__) |
|
25 |
typedef long int int32_t; |
|
26 |
typedef long long int int64_t; |
|
27 |
typedef unsigned long long int uint64_t; |