[commits] r2039 - in /fsf/trunk/libc: ChangeLog bits/in.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Apr 21 00:01:41 2007
New Revision: 2039

Log:
Import glibc-mainline for 2007-04-21

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/bits/in.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Apr 21 00:01:41 2007
@@ -1,3 +1,10 @@
+2007-04-19  Andreas Jaeger  <aj@xxxxxxx>
+
+	[BZ #3905]
+	* bits/in.h (IPV6_ROUTER_ALERT, IPV6_MTU_DISCOVER, IPV6_MTU,
+	IPV6_RECVERR, IPV6_V6ONLY, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST):
+	Added.
+
 2007-04-19  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* include/sys/mman.h: Mark madvise hidden.

Modified: fsf/trunk/libc/bits/in.h
==============================================================================
--- fsf/trunk/libc/bits/in.h (original)
+++ fsf/trunk/libc/bits/in.h Sat Apr 21 00:01:41 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2000, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2000, 2004, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -68,6 +68,13 @@
 #define IPV6_MULTICAST_LOOP	19
 #define IPV6_JOIN_GROUP		20
 #define IPV6_LEAVE_GROUP	21
+#define IPV6_ROUTER_ALERT      22
+#define IPV6_MTU_DISCOVER      23
+#define IPV6_MTU               24
+#define IPV6_RECVERR           25
+#define IPV6_V6ONLY            26
+#define IPV6_JOIN_ANYCAST      27
+#define IPV6_LEAVE_ANYCAST     28
 
 /* Obsolete synonyms for the above.  */
 #define IPV6_ADD_MEMBERSHIP	IPV6_JOIN_GROUP