summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-10-26 07:40:45 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-10-26 07:40:45 +0000
commit3822913741d1789fce3c87bd8f8e334613cc2d28 (patch)
tree87f2a3639ea045f4bce040fa5ef6b4a992c790b8
parentReformat. (diff)
downloadrtems-3822913741d1789fce3c87bd8f8e334613cc2d28.tar.bz2
2004-10-26 Ralf Corsepius <ralf_corsepius@rtems.org>
* libcsupport/include/sys/ioccom.h: Cosmetical update from FreeBSD.
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/libcsupport/include/sys/ioccom.h9
2 files changed, 9 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 69b8f980af..85c8ce3b07 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,7 +1,11 @@
+2004-10-26 Ralf Corsepius <ralf_corsepius@rtems.org>
+
+ * libcsupport/include/sys/ioccom.h: Cosmetical update from FreeBSD.
+
2004-10-25 Eric Norum <norume@aps.anl.gov>
* libnetworking/net/if_ethersubr.c: Working version of ether_sprintf().
- * cpukit/librpc/include/rpc/xdr.h: No kernel/user distinction.
+ * cpukit/librpc/include/rpc/xdr.h: No kernel/user distinction.
2004-10-22 Ralf Corsepius <ralf_corsepius@rtems.org>
diff --git a/cpukit/libcsupport/include/sys/ioccom.h b/cpukit/libcsupport/include/sys/ioccom.h
index 4ebffd19cd..c6437856f2 100644
--- a/cpukit/libcsupport/include/sys/ioccom.h
+++ b/cpukit/libcsupport/include/sys/ioccom.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,9 @@
* SUCH DAMAGE.
*
* @(#)ioccom.h 8.2 (Berkeley) 3/28/94
+ * $FreeBSD: src/sys/sys/ioccom.h,v 1.15 2004/04/07 04:19:49 imp Exp $
+ */
+/*
* $Id$
*/
@@ -92,7 +91,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-int ioctl __P((int, int, ...));
+int ioctl(int, int, ...);
__END_DECLS
#endif /* !KERNEL */