From a67c316ac855d1d138012473f26512fb0a75d6e5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 28 Mar 2007 15:31:39 +0000 Subject: [PATCH] =?UTF-8?q?2007-03-28=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * libcsupport/include/sys/sockio.h: Partial update from FreeBSD. --- cpukit/ChangeLog | 5 +++++ cpukit/libcsupport/include/sys/sockio.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 5124e3d111..295e08faae 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2007-03-28 Ralf Corsépius + + * libcsupport/include/sys/sockio.h: Partial update from + FreeBSD. + 2007-03-28 Ralf Corsépius * libnetworking/netinet/ip_output.c: Use uint32_t optlen. diff --git a/cpukit/libcsupport/include/sys/sockio.h b/cpukit/libcsupport/include/sys/sockio.h index 5e54baffe8..15ade24729 100644 --- a/cpukit/libcsupport/include/sys/sockio.h +++ b/cpukit/libcsupport/include/sys/sockio.h @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,6 +27,10 @@ * SUCH DAMAGE. * * @(#)sockio.h 8.1 (Berkeley) 3/28/94 + * $FreeBSD: src/sys/sys/sockio.h,v 1.31 2006/07/09 06:04:00 sam Exp $ + */ + +/* * $Id$ */