From 0453a51caad2acd04f218dedb6543305fa51179b Mon Sep 17 00:00:00 2001
From: kleink <kleink@NetBSD.org>
Date: Wed, 14 Oct 1998 21:13:04 +0000
Subject: [PATCH] Kill __LIBUTIL_BUILD in favor of the newly added _LIBC
 indicator completely; suggested by Jason Thorpe.

---
 lib/libc/gen/pw_scan.c | 12 ++++++------
 lib/libutil/Makefile   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index fe2f53aa6908..1385610535d6 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pw_scan.c,v 1.6 1998/10/14 20:08:12 kleink Exp $	*/
+/*	$NetBSD: pw_scan.c,v 1.7 1998/10/14 21:13:04 kleink Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pw_scan.c,v 1.6 1998/10/14 20:08:12 kleink Exp $");
+__RCSID("$NetBSD: pw_scan.c,v 1.7 1998/10/14 21:13:04 kleink Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #if defined(_LIBC)
@@ -50,15 +50,15 @@ __RCSID("$NetBSD: pw_scan.c,v 1.6 1998/10/14 20:08:12 kleink Exp $");
 #include <string.h>
 #include <unistd.h>
 
-#ifndef __LIBUTIL_BUILD
+#ifdef _LIBC
 #include "pw_private.h"
 #endif
 
 int
-#ifdef __LIBUTIL_BUILD
-pw_scan(bp, pw, flags)
-#else
+#ifdef _LIBC
 __pw_scan(bp, pw, flags)
+#else
+pw_scan(bp, pw, flags)
 #endif
 	char *bp;
 	struct passwd *pw;
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index b19528ff8fb5..928d31182353 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.19 1998/06/27 05:08:56 thorpej Exp $
+#	$NetBSD: Makefile,v 1.20 1998/10/14 21:13:05 kleink Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 LIB=	util
-CPPFLAGS+=-DLIBC_SCCS -D__LIBUTIL_BUILD
+CPPFLAGS+=-DLIBC_SCCS
 SRCS=	fparseln.c getmaxpartitions.c getrawpartition.c login.c login_tty.c \
 	logout.c logwtmp.c opendisk.c passwd.c pw_scan.c pidlock.c pty.c \
 	ttyaction.c ttymsg.c bswap.c