[src/trunk]: src/lib/libc Make compilable from src/tools/compat.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/lib/libc Make compilable from src/tools/compat.
From: tv <tv%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 10:22:22 +0000
details:   https://anonhg.NetBSD.org/src/rev/51186a4adaa4
branches:  trunk
changeset: 521345:51186a4adaa4
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Jan 28 22:39:07 2002 +0000

description:
Make compilable from src/tools/compat.

diffstat:

 lib/libc/gen/err.c       |   6 ++++--
 lib/libc/gen/errx.c      |   6 ++++--
 lib/libc/gen/verr.c      |   6 ++++--
 lib/libc/gen/verrx.c     |   6 ++++--
 lib/libc/gen/vwarn.c     |   6 ++++--
 lib/libc/gen/vwarnx.c    |   6 ++++--
 lib/libc/gen/warn.c      |   6 ++++--
 lib/libc/gen/warnx.c     |   6 ++++--
 lib/libc/string/strsep.c |  10 ++++++++--
 9 files changed, 40 insertions(+), 18 deletions(-)

diffs (257 lines):

diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/err.c
--- a/lib/libc/gen/err.c        Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/err.c        Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: err.c,v 1.16 1999/08/17 03:43:59 mycroft Exp $ */
+/*     $NetBSD: err.c,v 1.17 2002/01/28 22:45:28 tv Exp $      */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: err.c,v 1.16 1999/08/17 03:43:59 mycroft Exp $");
+__RCSID("$NetBSD: err.c,v 1.17 2002/01/28 22:45:28 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 
 #ifdef __STDC__
 #include <stdarg.h>
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/errx.c
--- a/lib/libc/gen/errx.c       Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/errx.c       Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: errx.c,v 1.4 1999/08/17 03:43:59 mycroft Exp $ */
+/*     $NetBSD: errx.c,v 1.5 2002/01/28 22:45:28 tv Exp $      */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: errx.c,v 1.4 1999/08/17 03:43:59 mycroft Exp $");
+__RCSID("$NetBSD: errx.c,v 1.5 2002/01/28 22:45:28 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 
 #ifdef __STDC__
 #include <stdarg.h>
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/verr.c
--- a/lib/libc/gen/verr.c       Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/verr.c       Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: verr.c,v 1.6 2001/02/19 22:22:16 cgd Exp $     */
+/*     $NetBSD: verr.c,v 1.7 2002/01/28 22:45:28 tv Exp $      */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: verr.c,v 1.6 2001/02/19 22:22:16 cgd Exp $");
+__RCSID("$NetBSD: verr.c,v 1.7 2002/01/28 22:45:28 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/verrx.c
--- a/lib/libc/gen/verrx.c      Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/verrx.c      Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: verrx.c,v 1.6 2001/02/19 22:22:16 cgd Exp $    */
+/*     $NetBSD: verrx.c,v 1.7 2002/01/28 22:45:28 tv Exp $     */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: verrx.c,v 1.6 2001/02/19 22:22:16 cgd Exp $");
+__RCSID("$NetBSD: verrx.c,v 1.7 2002/01/28 22:45:28 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/vwarn.c
--- a/lib/libc/gen/vwarn.c      Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/vwarn.c      Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vwarn.c,v 1.6 2001/02/19 22:22:16 cgd Exp $    */
+/*     $NetBSD: vwarn.c,v 1.7 2002/01/28 22:45:29 tv Exp $     */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vwarn.c,v 1.6 2001/02/19 22:22:16 cgd Exp $");
+__RCSID("$NetBSD: vwarn.c,v 1.7 2002/01/28 22:45:29 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/vwarnx.c
--- a/lib/libc/gen/vwarnx.c     Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/vwarnx.c     Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vwarnx.c,v 1.6 2001/02/19 22:22:16 cgd Exp $   */
+/*     $NetBSD: vwarnx.c,v 1.7 2002/01/28 22:45:29 tv Exp $    */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: vwarnx.c,v 1.6 2001/02/19 22:22:16 cgd Exp $");
+__RCSID("$NetBSD: vwarnx.c,v 1.7 2002/01/28 22:45:29 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/warn.c
--- a/lib/libc/gen/warn.c       Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/warn.c       Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: warn.c,v 1.4 1999/08/17 03:43:59 mycroft Exp $ */
+/*     $NetBSD: warn.c,v 1.5 2002/01/28 22:45:29 tv Exp $      */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: warn.c,v 1.4 1999/08/17 03:43:59 mycroft Exp $");
+__RCSID("$NetBSD: warn.c,v 1.5 2002/01/28 22:45:29 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 
 #ifdef __STDC__
 #include <stdarg.h>
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/gen/warnx.c
--- a/lib/libc/gen/warnx.c      Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/gen/warnx.c      Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: warnx.c,v 1.4 1999/08/17 03:44:00 mycroft Exp $        */
+/*     $NetBSD: warnx.c,v 1.5 2002/01/28 22:45:29 tv Exp $     */
 
 /*-
  * Copyright (c) 1993
@@ -38,14 +38,16 @@
 #if 0
 static char sccsid[] = "@(#)err.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: warnx.c,v 1.4 1999/08/17 03:44:00 mycroft Exp $");
+__RCSID("$NetBSD: warnx.c,v 1.5 2002/01/28 22:45:29 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef __NO_NAMESPACE_H       /* XXX */
 #include "namespace.h"
 #endif
+#if !HAVE_CONFIG_H
 #include <err.h>
+#endif
 
 #ifdef __STDC__
 #include <stdarg.h>
diff -r 4c8a4204daa9 -r 51186a4adaa4 lib/libc/string/strsep.c
--- a/lib/libc/string/strsep.c  Mon Jan 28 22:15:54 2002 +0000
+++ b/lib/libc/string/strsep.c  Mon Jan 28 22:39:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strsep.c,v 1.11 2000/01/22 22:19:20 mycroft Exp $      */
+/*     $NetBSD: strsep.c,v 1.12 2002/01/28 22:39:07 tv Exp $   */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -33,12 +33,15 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#else
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)strsep.c   8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: strsep.c,v 1.11 2000/01/22 22:19:20 mycroft Exp $");
+__RCSID("$NetBSD: strsep.c,v 1.12 2002/01/28 22:39:07 tv Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,7 +53,9 @@
 #ifdef __weak_alias
 __weak_alias(strsep,_strsep)
 #endif
+#endif
 
+#if !HAVE_STRSEP
 /*
  * Get next token from string *stringp, where tokens are possibly-empty
  * strings separated by characters from delim.  
@@ -93,3 +98,4 @@
        }
        /* NOTREACHED */
 }
+#endif
Prev by Date: [src/trunk]: src/sys/arch/m68k/include Define EF_CPU32 and EF_M68000.
Next by Date: [src/trunk]: src/share/mk Make sun2 use the new toolchain.
Previous by Thread: [src/trunk]: src/sys/arch/m68k/include Define EF_CPU32 and EF_M68000.
Next by Thread: [src/trunk]: src/share/mk Make sun2 use the new toolchain.
Indexes:
Home | Main Index | Thread Index | Old Index