aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2016-06-02 23:30:11 -0400
committerCarlos O'Donell <carlos@redhat.com>2016-06-02 23:52:06 -0400
commit1c1e7fb65828c99d6e0f0f3857089b559a0c8189 (patch)
treeec54f58a6ecbbc2380b9f1e7a8d6b1ab21a7c235 /sysdeps/unix
parentf06f3f05b48c72e2c9b0fa78671f94fd22d67da8 (diff)
downloadglibc-1c1e7fb65828c99d6e0f0f3857089b559a0c8189.zip
glibc-1c1e7fb65828c99d6e0f0f3857089b559a0c8189.tar.gz
glibc-1c1e7fb65828c99d6e0f0f3857089b559a0c8189.tar.bz2
Fix macro API for __USE_KERNEL_IPV6_DEFS.
The use of __USE_KERNEL_IPV6_DEFS with ifndef is bad practice per: https://sourceware.org/glibc/wiki/Wundef. This change moves it to use 'if' and always define the macro. Please note that this is not the only problem with this code. I have a series of fixes after this one to resolve breakage with this code and add regression tests for it via compile-only source testing (to be discussed in another thread). Unfortunately __USE_KERNEL_XATTR_DEFS is set by the kernel and not glibc, and uses 'define', so we can't fix that yet.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/bits/in.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index d75c07b..9bdadf3 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -30,7 +30,9 @@
/* This is not quite the same API since the kernel always defines s6_addr16 and
s6_addr32. This is not a violation of POSIX since POSIX says "at least the
following member" and that holds true. */
-# define __USE_KERNEL_IPV6_DEFS
+# define __USE_KERNEL_IPV6_DEFS 1
+#else
+# define __USE_KERNEL_IPV6_DEFS 0
#endif
/* Options for use with `getsockopt' and `setsockopt' at the IP level.