PATCH: avoid glibc conflict

PATCH: avoid glibc conflict

[Keith M Wesolowski]

This is needed to avoid a conflict with glibc on bigendian platforms
when -O or higher is specified.  It's already in 2.6, and I'm not sure
why it hasn't been seen in 2.4.  The symptom is that this program will
not compile with -O2:

#include <asm/byteorder.h>
#include <netinet/in.h>
int main () { }

Here's the patch.

--- 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 */


-- 
Keith M Wesolowski <wesolows@foobazco.org> http://foobazco.org/~wesolows
------(( Project Foobazco Coordinator and Network Administrator ))------
	"May Buddha bless all stubborn people!"
				-- Uliassutai Karakorum Blake

Re: PATCH: avoid glibc conflict

[Ralf Baechle]

On Wed, Aug 27, 2003 at 09:31:12PM -0700, Keith M Wesolowski wrote:

> This is needed to avoid a conflict with glibc on bigendian platforms
> when -O or higher is specified.  It's already in 2.6, and I'm not sure
> why it hasn't been seen in 2.4.  The symptom is that this program will
> not compile with -O2:
> 
> #include <asm/byteorder.h>
> #include <netinet/in.h>
> int main () { }
> 
> Here's the patch.

I sent one to Marcelo.

  Ralf