From 44e36af42bde0f212f7a1c10653d9f7b1a00bdb3 Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@geoffk.org>
Date: Wed, 30 Aug 2000 18:30:16 +0000
Subject: [PATCH] 	* libc/string/swab.c: Specify that it's defined in
 <unistd.h>. 	* libc/include/string.h: Don't include <sys/types.h>, 	as it
 causes really bad namespace pollution.  Don't declare 	swab(), it is properly
 declared in unistd.h.

---
 newlib/ChangeLog             | 7 +++++++
 newlib/libc/include/string.h | 2 --
 newlib/libc/string/swab.c    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 98dc1414f..0feee13f2 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-30  Geoffrey Keating  <geoffk@cygnus.com>
+
+	* libc/string/swab.c: Specify that it's defined in <unistd.h>.
+	* libc/include/string.h: Don't include <sys/types.h>,
+	as it causes really bad namespace pollution.  Don't declare
+	swab(), it is properly declared in unistd.h.
+
 2000-08-29  Werner Almesberger  <Werner.Almesberger@epfl.ch>
 
         * libc/unix/getpwent.c (getpwnam, getpwuid, getpwent): removed
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index 7d5bd45af..e85dac33e 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -13,7 +13,6 @@ extern "C" {
 
 #include "_ansi.h"
 #include <sys/reent.h>
-#include <sys/types.h>
 
 #define __need_size_t
 #include <stddef.h>
@@ -72,7 +71,6 @@ const char  *_EXFUN(strsignal, (int __signo));
 #endif
 int     _EXFUN(strtosigno, (const char *__name));
 #endif
-void	 _EXFUN(swab,(const void *, void *, ssize_t));
 
 /* These function names are used on Windows and perhaps other systems.  */
 #ifndef strcmpi
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index 98daf5a1a..82483371c 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -3,7 +3,7 @@ FUNCTION
 	<<swab>>---swap adjacent bytes
 
 ANSI_SYNOPSIS
-	#include <string.h>
+	#include <unistd.h>
 	void swab(const void *<[in]>, void *<[out]>, ssize_t <[n]>);
 
 TRAD_SYNOPSIS