summaryrefslogtreecommitdiff
blob: 4ce24200d0f3771ba1a4b3d02800ef9316a41bb4 (plain)
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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
C99 standard allows the use of the long long data type, both signed and
unsigned. We should allow this to be used if defined.

Signed-off-by: Roy Marples <uberlord@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -120,7 +123,7 @@ typedef		__u8		uint8_t;
 typedef		__u16		uint16_t;
 typedef		__u32		uint32_t;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef		__u64		uint64_t;
 typedef		__u64		u_int64_t;
 typedef		__s64		int64_t;
@@ -182,7 +185,7 @@ typedef __u16 __bitwise __le16;
 typedef __u16 __bitwise __be16;
 typedef __u32 __bitwise __le32;
 typedef __u32 __bitwise __be32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __u64 __bitwise __le64;
 typedef __u64 __bitwise __be64;
 #endif
--- a/include/asm-arm/types.h
+++ b/include/asm-arm/types.h
@@ -19,7 +19,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-avr32/types.h
+++ b/include/asm-avr32/types.h
@@ -25,7 +25,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-cris/types.h
+++ b/include/asm-cris/types.h
@@ -19,7 +19,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-frv/types.h
+++ b/include/asm-frv/types.h
@@ -30,7 +30,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-h8300/types.h
+++ b/include/asm-h8300/types.h
@@ -27,7 +27,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-i386/types.h
+++ b/include/asm-i386/types.h
@@ -19,7 +19,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-m68k/types.h
+++ b/include/asm-m68k/types.h
@@ -27,7 +27,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-mips/types.h
+++ b/include/asm-mips/types.h
@@ -34,7 +34,7 @@
 
 #else
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-parisc/types.h
+++ b/include/asm-parisc/types.h
@@ -19,7 +19,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-powerpc/types.h
+++ b/include/asm-powerpc/types.h
@@ -40,7 +40,7 @@
 typedef __signed__ long __s64;
 typedef unsigned long __u64;
 #else
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -28,7 +28,7 @@
 typedef unsigned int __u32;
 
 #ifndef __s390x__
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-sh/types.h
+++ b/include/asm-sh/types.h
@@ -19,7 +19,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-sh64/types.h
+++ b/include/asm-sh64/types.h
@@ -30,7 +30,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-v850/types.h
+++ b/include/asm-v850/types.h
@@ -27,7 +27,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif
--- a/include/asm-xtensa/types.h
+++ b/include/asm-xtensa/types.h
@@ -29,7 +29,7 @@
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif