From db7acc382fd5b2c5e58c0413028a367574e5c8b8 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Wed, 30 Aug 2000 18:34:53 +0000
Subject: [PATCH] 2000-08-30  Werner Almesberger  <Werner.Almesberger@epfl.ch>

        * libc/posix/execve.c: included unistd.h for "_execve" prototype.
        * libc/misc/unctrl.c libc/sys/sysvi386/crt0.c (sccsid): changed
        "#ifndef lint" to "#if defined(LIBC_SCCS) && !defined(lint)" like
        everywhere else.
---
 newlib/ChangeLog                | 7 +++++++
 newlib/libc/misc/unctrl.c       | 4 ++--
 newlib/libc/posix/execve.c      | 4 ++++
 newlib/libc/sys/sysvi386/crt0.c | 4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 0feee13f2..368d2bcc0 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-30  Werner Almesberger  <Werner.Almesberger@epfl.ch>
+
+        * libc/posix/execve.c: included unistd.h for "_execve" prototype.
+        * libc/misc/unctrl.c libc/sys/sysvi386/crt0.c (sccsid): changed
+        "#ifndef lint" to "#if defined(LIBC_SCCS) && !defined(lint)" like
+        everywhere else.
+
 2000-08-30  Geoffrey Keating  <geoffk@cygnus.com>
 
 	* libc/string/swab.c: Specify that it's defined in <unistd.h>.
diff --git a/newlib/libc/misc/unctrl.c b/newlib/libc/misc/unctrl.c
index e7350c657..710bf16bd 100644
--- a/newlib/libc/misc/unctrl.c
+++ b/newlib/libc/misc/unctrl.c
@@ -70,9 +70,9 @@ No supporting OS subroutines are required.
 
 #include <_ansi.h>
 
-#ifndef lint
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)unctrl.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
+#endif /* LIBC_SCCS and not lint */
 
 _CONST char * _CONST __unctrl[256] = {
 	"^@",  "^A",  "^B",  "^C",  "^D",  "^E",  "^F",  "^G",
diff --git a/newlib/libc/posix/execve.c b/newlib/libc/posix/execve.c
index 416144e86..1be0ed128 100644
--- a/newlib/libc/posix/execve.c
+++ b/newlib/libc/posix/execve.c
@@ -3,6 +3,10 @@
 /* This and the other exec*.c files in this directory require 
    the target to provide the _execve syscall.  */
 
+
+#include <unistd.h>
+
+
 int
 execve (const char *path, char * const argv[], char * const envp[])
 {
diff --git a/newlib/libc/sys/sysvi386/crt0.c b/newlib/libc/sys/sysvi386/crt0.c
index 7949b3d4c..b41c00a3c 100644
--- a/newlib/libc/sys/sysvi386/crt0.c
+++ b/newlib/libc/sys/sysvi386/crt0.c
@@ -31,9 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)crt0.c	5.7 (Berkeley) 7/3/91";
-#endif /* not lint */
+#endif /* LIBC_SCCS and not lint */
 
 /*
  *	C start up routine.