* 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.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 98dc1414fb6f4279cfb6d74917fdc8c910caf86a..0feee13f26686382738fbde60306678af1e8c653 100644 (file)
--- 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 7d5bd45af3126c4bb8a9a2c07bb2e187f2dd83b7..e85dac33ea6f8d3bbe1b08e91d5467c4940d448e 100644 (file)
--- 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 98daf5a1a0f3ae53ffca20c69284acbb5942fc12..82483371c5ff320752281c339cfec1991b2e45cc 100644 (file)
--- 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