blob: bec279abce81a2ae74518dcb5a6c6fa8cb8092d0 (
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
|
--- linux/include/linux/byteorder/generic.h.orig 2003-08-10 18:15:07.000000000 -0700
+++ linux/include/linux/byteorder/generic.h 2003-08-10 18:16:36.000000000 -0700
@@ -122,7 +122,7 @@
#define be16_to_cpus __be16_to_cpus
#endif
-
+#if defined(__KERNEL__)
/*
* Handle ntohl and suches. These have various compatibility
* issues - like we want to give the prototype even though we
@@ -146,35 +146,26 @@
* Do the prototypes. Somebody might want to take the
* address or some such sick thing..
*/
-#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
extern __u32 ntohl(__u32);
extern __u32 htonl(__u32);
-#else
-extern unsigned long int ntohl(unsigned long int);
-extern unsigned long int htonl(unsigned long int);
-#endif
extern unsigned short int ntohs(unsigned short int);
extern unsigned short int htons(unsigned short int);
-
-#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) && !defined(__STRICT_ANSI__)
+#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define ___htonl(x) __cpu_to_be32(x)
#define ___htons(x) __cpu_to_be16(x)
#define ___ntohl(x) __be32_to_cpu(x)
#define ___ntohs(x) __be16_to_cpu(x)
-#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
#define htonl(x) ___htonl(x)
#define ntohl(x) ___ntohl(x)
-#else
-#define htonl(x) ((unsigned long)___htonl(x))
-#define ntohl(x) ((unsigned long)___ntohl(x))
-#endif
#define htons(x) ___htons(x)
#define ntohs(x) ___ntohs(x)
#endif /* OPTIMIZE */
+#endif /* KERNEL */
+
#endif /* _LINUX_BYTEORDER_GENERIC_H */
|
GitWeb
