2 files changed, 11 insertions, 18 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 8336aa4038..983526a075 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 93, 94, 95, 96 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
@@ -73,18 +73,19 @@ typedef long double __long_double_t;
 #define __ptr_t char *
 typedef double __long_double_t;
 
-#endif
-
-/* The BSD header files use the ANSI keywords unmodified.  (This means that
-   old programs may lose if they use the new keywords as identifiers.)  We
-   define them to their __ versions, which are taken care of above.  */
-
+/* The BSD header files use the ANSI keywords unmodified (this means that
+   old programs may lose if they use the new keywords as identifiers), but
+   those names are not available under -traditional.  We define them to
+   their __ versions, which are taken care of above.  */
 #ifdef	__USE_BSD
 #define	const		__const
 #define	signed		__signed
 #define	volatile	__volatile
 #endif
 
+#endif	/* __STDC__ */
+
+
 /* C++ needs to know that types and declarations are C, not C++.  */
 #ifdef	__cplusplus
 #define	__BEGIN_DECLS	extern "C" {
diff --git a/misc/sys/uio.h b/misc/sys/uio.h
index 301712546f..491d534e75 100644
--- a/misc/sys/uio.h
+++ b/misc/sys/uio.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996 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
@@ -26,16 +26,8 @@ __BEGIN_DECLS
 #define	__need_size_t
 #include <stddef.h>
 
-
-/* Structure describing a section of memory.  */
-
-struct iovec
-{
-  /* Starting address.  */
-  __ptr_t iov_base;
-  /* Length in bytes.  */
-  size_t iov_len;
-};
+/* This file defines `struct iovec'.  */
+#include <iovec.h>
 
 
 /* Read data from file descriptor FD, and put the result in the