diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-05-11 15:35:48 +0800 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-05-11 15:35:48 +0800 |
| commit | bd9195d134a60d79cf531a3f91b59a9981702b7f (patch) | |
| tree | 81046410cf64f9cf5cf6b9316819a01f84d91e41 /bits | |
| parent | 937ccbb0fefee902716c495020b4a87f92796379 (diff) | |
| parent | 836b9ff049842ad31e114989fc5b7f14ed63c3ae (diff) | |
Merge branch 't/init-first.c' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
bits/in.h
hurd/catch-signal.c
sysdeps/mach/hurd/accept.c
sysdeps/mach/hurd/accept4.c
sysdeps/mach/hurd/bits/socket.h
sysdeps/mach/hurd/dl-sysdep.c
sysdeps/mach/hurd/dup2.c
sysdeps/mach/hurd/dup3.c
sysdeps/mach/hurd/i386/____longjmp_chk.S
sysdeps/mach/hurd/i386/init-first.c
sysdeps/mach/hurd/kernel-features.h
sysdeps/mach/hurd/opendir.c
sysdeps/mach/hurd/symlink.c
sysdeps/mach/hurd/symlinkat.c
Diffstat (limited to 'bits')
| -rw-r--r-- | bits/in.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 @@ -22,7 +22,7 @@ #endif /* To select the IP level. */ -#define SOL_IP 0 +#define SOL_IP 0 /* Options for use with `getsockopt' and `setsockopt' at the IP level. The first word in the comment at the right is the data type used; @@ -50,9 +50,9 @@ struct ip_opts char ip_opts[40]; /* Actually variable in size. */ }; -/* Socket level values for IPv6. */ -#define SOL_IPV6 41 -#define SOL_ICMPV6 58 +/* Socket-level values for IPv6. */ +#define SOL_IPV6 41 +#define SOL_ICMPV6 58 /* IPV6 socket options. */ #define IPV6_ADDRFORM 1 |