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
|
--- linux-2.4.22/include/asm-i386/types.h 2003-11-10 07:38:32.000000000 +0200
+++ linux-2.4.22.ext/include/asm-i386/types.h 2003-11-10 07:48:42.000000000 +0200
@@ -17,11 +17,15 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#ifndef __GNUC__
+# ifndef __extension__
+# define __extension__
+# endif
#endif
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
+
/*
* These aren't exported outside the kernel to avoid name space clashes
*/
--- linux-2.4.22/include/asm-i386/byteorder.h 2003-12-05 20:02:56.000000000 +0000
+++ linux-2.4.22.plasmaroo/include/asm-i386/byteorder.h 2003-12-05 20:05:45.000000000 +0000
@@ -35,7 +35,7 @@
}
-static inline __u64 ___arch__swab64(__u64 val)
+static __inline__ __const__ __u64 ___arch__swab64(__u64 val)
{
union {
struct { __u32 a,b; } s;
@@ -43,13 +43,13 @@
} v;
v.u = val;
#ifdef CONFIG_X86_BSWAP
- asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1"
+ __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1"
: "=r" (v.s.a), "=r" (v.s.b)
: "0" (v.s.a), "1" (v.s.b));
#else
v.s.a = ___arch__swab32(v.s.a);
v.s.b = ___arch__swab32(v.s.b);
- asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));
+ __asm__("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));
#endif
return v.u;
}
|
GitWeb
