about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2016-07-08 11:24:34 +0200
committerAurelien Jarno <aurelien@aurel32.net>2016-07-08 11:24:34 +0200
commitbe4830bf94e1159b00c4cc97c084c6e4765a61ae (patch)
tree619fa8a5dcbcd5439101b3c50ee3a7b972439520
parent6bcc7ced4fd417e8f65b9b8f50ad7010c3549d9f (diff)
downloadglibc-be4830bf94e1159b00c4cc97c084c6e4765a61ae.tar.gz
glibc-be4830bf94e1159b00c4cc97c084c6e4765a61ae.tar.xz
glibc-be4830bf94e1159b00c4cc97c084c6e4765a61ae.zip
Define __USE_KERNEL_IPV6_DEFS macro for non-Linux kernels
Commit 1c1e7fb6 changed the __USE_KERNEL_IPV6_DEFS tests from 'ifdef'
to 'if'. As inet/netinet.in.h is a generic file, this causes a warning
on non-Linux kernels (for example Hurd). To fix that define it in the
generic bits/in.h file.

Changelog:
	* bits/in.h (__USE_KERNEL_IPV6_DEFS): Define to 0.
-rw-r--r--ChangeLog4
-rw-r--r--bits/in.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a7a875cf18..e0717516d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-07-08  Aurelien Jarno  <aurelien@aurel32.net>
 
+	* bits/in.h (__USE_KERNEL_IPV6_DEFS): Define to 0.
+
+2016-07-08  Aurelien Jarno  <aurelien@aurel32.net>
+
 	[BZ #20240]
 	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile
 	(CFLAGS-s_modf-ppc32.c): New variable.
diff --git a/bits/in.h b/bits/in.h
index d517115bb2..7dc93c192f 100644
--- a/bits/in.h
+++ b/bits/in.h
@@ -21,6 +21,9 @@
 # error "Never use <bits/in.h> directly; include <netinet/in.h> instead."
 #endif
 
+/* This is the generic version, do not assume a linux-based kernel.  */
+#define __USE_KERNEL_IPV6_DEFS 0
+
 /* To select the IP level.  */
 #define SOL_IP		0