Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/sunlabel O_* live in <sys/fcntl.h> not <sys/file.h>
details: https://anonhg.NetBSD.org/src/rev/c9c981bbd331
branches: trunk
changeset: 555224:c9c981bbd331
user: matt <matt%NetBSD.org@localhost>
date: Wed Nov 12 02:17:53 2003 +0000
description:
O_* live in <sys/fcntl.h> not <sys/file.h>
Don't use TERMCAP if HOSTPROG.
diffstat:
usr.sbin/sunlabel/Makefile | 4 ++--
usr.sbin/sunlabel/sunlabel.c | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diffs (50 lines):
diff -r d7efce059ed2 -r c9c981bbd331 usr.sbin/sunlabel/Makefile
--- a/usr.sbin/sunlabel/Makefile Wed Nov 12 02:08:11 2003 +0000
+++ b/usr.sbin/sunlabel/Makefile Wed Nov 12 02:17:53 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/05/18 07:57:40 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2003/11/12 02:17:53 matt Exp $
PROG= sunlabel
MAN= sunlabel.8
+.ifndef HOSTPROG
LDADD+= -ltermcap
-.ifndef HOSTPROG
DPADD+= ${LIBTERMCAP}
DPADD+= ${LIBUTIL}
diff -r d7efce059ed2 -r c9c981bbd331 usr.sbin/sunlabel/sunlabel.c
--- a/usr.sbin/sunlabel/sunlabel.c Wed Nov 12 02:08:11 2003 +0000
+++ b/usr.sbin/sunlabel/sunlabel.c Wed Nov 12 02:17:53 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunlabel.c,v 1.11 2003/07/13 12:12:58 itojun Exp $ */
+/* $NetBSD: sunlabel.c,v 1.12 2003/11/12 02:17:53 matt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: sunlabel.c,v 1.11 2003/07/13 12:12:58 itojun Exp $");
+__RCSID("$NetBSD: sunlabel.c,v 1.12 2003/11/12 02:17:53 matt Exp $");
#endif
#include <stdio.h>
@@ -46,12 +46,15 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
+#ifndef NO_TERMCAP_WIDTH
#include <termcap.h>
+#endif
#include <string.h>
#include <strings.h>
#include <inttypes.h>
#include <err.h>
+#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/ioctl.h>
Home |
Main Index |
Thread Index |
Old Index