From 5478bf376fb3d280f7eef7da7dfaaea97dd8b353 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Tue, 21 Nov 2000 23:57:25 +0000
Subject: [PATCH] 2000-11-20  Jeff Johnston  <jjohnstn@redhat.com>

        * libc/include/sys/unistd.h: Removed definition of MAXNAMLEN.
        * libc/include/dirent.h: Added definition of MAXNAMLEN if
        not defined by sys/dirent.h.
        * libc/posix/execvp.c: Added include of dirent.h to get
        MAXNAMLEN value which used to be in unistd.h.
---
 newlib/ChangeLog                 | 8 ++++++++
 newlib/libc/include/dirent.h     | 5 +++++
 newlib/libc/include/sys/unistd.h | 4 ----
 newlib/libc/posix/execvp.c       | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index b736cfc81..dd238b032 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-20  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/include/sys/unistd.h: Removed definition of MAXNAMLEN.
+	* libc/include/dirent.h: Added definition of MAXNAMLEN if
+	not defined by sys/dirent.h.
+	* libc/posix/execvp.c: Added include of dirent.h to get
+	MAXNAMLEN value which used to be in unistd.h.
+
 Mon Nov  6 12:56:00 2000  Corinna Vinschen <vinschen@cygnus.com>
 
 	* libc/include/sys/types.h: Change type of i to `size_t' in
diff --git a/newlib/libc/include/dirent.h b/newlib/libc/include/dirent.h
index eaa4c190d..9e33a0dcb 100644
--- a/newlib/libc/include/dirent.h
+++ b/newlib/libc/include/dirent.h
@@ -2,6 +2,11 @@
 extern "C" {
 #endif
 #include <sys/dirent.h>
+
+#if !defined(MAXNAMLEN) && !defined(_POSIX_SOURCE)
+#define MAXNAMLEN 1024
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 87cf6108e..fa103a91f 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -176,10 +176,6 @@ long _EXFUN(sysconf, (int __name));
 # define	_PC_PRIO_IO            10
 # define	_PC_SYNC_IO            11
 
-# ifndef	_POSIX_SOURCE
-#  define	MAXNAMLEN	1024
-# endif		/* _POSIX_SOURCE */
-
 /* FIXME: This is temporary until winsup gets sorted out.  */
 #ifdef __CYGWIN__
 #define MAXPATHLEN (260 - 1 /* NUL */)
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index 1b30f0760..1f58b8d93 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -6,6 +6,7 @@
 #include <_ansi.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>