Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sunlabel s/Der Mouse/der Mouse/.



details:   https://anonhg.NetBSD.org/src/rev/c54852ca9bd5
branches:  trunk
changeset: 522062:c54852ca9bd5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 11 03:47:05 2002 +0000

description:
s/Der Mouse/der Mouse/.
reinstate the S_COMMAND #ifdefs.

diffstat:

 usr.sbin/sunlabel/sunlabel.c |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r c70f9992324a -r c54852ca9bd5 usr.sbin/sunlabel/sunlabel.c
--- a/usr.sbin/sunlabel/sunlabel.c      Mon Feb 11 03:43:53 2002 +0000
+++ b/usr.sbin/sunlabel/sunlabel.c      Mon Feb 11 03:47:05 2002 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: sunlabel.c,v 1.3 2002/01/10 21:43:10 christos Exp $ */
+/* $NetBSD: sunlabel.c,v 1.4 2002/02/11 03:47:05 mrg Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Der Mouse.
+ * by der Mouse.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sunlabel.c,v 1.3 2002/01/10 21:43:10 christos Exp $");
+__RCSID("$NetBSD: sunlabel.c,v 1.4 2002/02/11 03:47:05 mrg Exp $");
 
 #include <stdio.h>
 #include <errno.h>
@@ -48,11 +48,18 @@
 #include <strings.h>
 #include <inttypes.h>
 #include <err.h>
-#include <util.h>
+
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 
+/* If neither S_COMMAND nor NO_S_COMMAND is defined, guess. */
+#if !defined(S_COMMAND) && !defined(NO_S_COMMAND)
+#define S_COMMAND
+#include <util.h>
+#endif
+#endif
+
 /*
  * NPART is the total number of partitions.  This must be <= 43, given the
  * amount of space available to store extended partitions. It also must be



Home | Main Index | Thread Index | Old Index