diff options
| -rw-r--r-- | ChangeLog | 40 | ||||
| -rw-r--r-- | bits/in.h | 9 |
2 files changed, 28 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 6848fb4838..11ca6b7073 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> + + [BZ #3906] + * bits/in.h (IPV6_PKTINFO): Define new macro. + (IPV6_RXINFO,IPV6_TXINFO,SCM_SRCINFO): Redefine to IPV6_PKTINFO. + 2012-05-09 Adhemerval Zanella <azanella@linux.vnet.ibm.com> [BZ #13954] @@ -150,16 +156,16 @@ (main): Remove informal message about syslog. (options): Fix typo. - [BZ #14053] - * sysdeps/x86_64/fpu/bits/mathinline.h (lrintf): Add __volatile + [BZ #14053] + * sysdeps/x86_64/fpu/bits/mathinline.h (lrintf): Add __volatile to asm. - (lrint): Likewise. - (llrintf): Likewise. - (llrint): Likewise. - (rint): Likewise. - (rintf): Likewise. - (nearbyint): Likewise. - (nearbyintf): Likewise. + (lrint): Likewise. + (llrintf): Likewise. + (llrint): Likewise. + (rint): Likewise. + (rintf): Likewise. + (nearbyint): Likewise. + (nearbyintf): Likewise. 2012-05-09 Andreas Jaeger <aj@suse.de> Pedro Alves <palves@redhat.com> @@ -170,12 +176,12 @@ 2012-05-09 Alexandre Oliva <aoliva@redhat.com> Andreas Jaeger <aj@suse.de> - * nscd/nscd.c (go_background): Replaced with... - (run_mode): ... this. + * nscd/nscd.c (go_background): Replaced with... + (run_mode): ... this. (RUN_FOREGROUND, RUN_DAEMONIZE, RUN_DEBUG): Add. - (options): Add -F --foreground. - (main): Implement it. - (parse_opt): Parse it. + (options): Add -F --foreground. + (main): Implement it. + (parse_opt): Parse it. 2012-05-09 Andreas Jaeger <aj@suse.de> @@ -351,9 +357,9 @@ 2012-05-08 Roland Mc Grath <roland@hack.frob.com> - [BZ #13979] - * include/features.h: Warn if user requests __FORTIFY_SOURCE - checking but the checks are disabled for any reason. + [BZ #13979] + * include/features.h: Warn if user requests __FORTIFY_SOURCE + checking but the checks are disabled for any reason. 2012-05-08 H.J. Lu <hongjiu.lu@intel.com> diff --git a/bits/in.h b/bits/in.h index 85f747ebaf..bb14b02da9 100644 --- a/bits/in.h +++ b/bits/in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2000, 2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1997-2012 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 @@ -49,7 +49,7 @@ struct ip_opts /* IPV6 socket options. */ #define IPV6_ADDRFORM 1 -#define IPV6_RXINFO 2 +#define IPV6_PKTINFO 2 #define IPV6_HOPOPTS 3 #define IPV6_DSTOPTS 4 #define IPV6_RTHDR 5 @@ -57,8 +57,9 @@ struct ip_opts #define IPV6_CHECKSUM 7 #define IPV6_HOPLIMIT 8 -#define IPV6_TXINFO IPV6_RXINFO -#define SCM_SRCINFO IPV6_TXINFO +#define IPV6_RXINFO IPV6_PKTINFO +#define IPV6_TXINFO IPV6_PKTINFO +#define SCM_SRCINFO IPV6_PKTINFO #define SCM_SRCRT IPV6_RXSRCRT #define IPV6_UNICAST_HOPS 16 |