Module Name:	src
Committed By:	jmc
Date:		Wed Jun 16 01:31:38 UTC 2004

Modified Files:
	src/tools/sunlabel [netbsd-1-6]: Makefile
	src/usr.sbin/sunlabel [netbsd-1-6]: sunlabel.c

Log Message:
Pull in some fixes from trunk so this compiles on non-NetBSD hosts. Found
during fixes for PR#24481


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.1.2.1 src/tools/sunlabel/Makefile
cvs rdiff -r1.5.2.3 -r1.5.2.4 src/usr.sbin/sunlabel/sunlabel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.