about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dfe5752a7..4e7fd30b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-06-02  Carlos O'Donell  <carlos@redhat.com>
+
+	* sysdeps/unix/sysv/linux/bits/in.h [defined _UAPI_LINUX_IN6_H ||
+	defined _UAPI_IPV6_H]: Define __USE_KERNEL_IPV6_DEFS to 1.
+	[!(defined _UAPI_LINUX_IN6_H || defined _UAPI_IPV6_H)]: Define
+	__USE_KERNEL_IPV6_DEFS to 0.
+	* inet/netinet/in.h: Use '#if !__USE_KERNEL_IPV6_DEFS'.
+	Update comment.
+
 2016-06-01  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #19861]