[src/netbsd-1-5]: src/sys/sys Pull up revisions 1.68-1.69 (requested by skrll):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/786dc291caec
branches:  netbsd-1-5
changeset: 492622:786dc291caec
user:      he <he%NetBSD.org@localhost>
date:      Tue Jan 29 22:16:37 2002 +0000

description:
Pull up revisions 1.68-1.69 (requested by skrll):
  Fix warnings about redefinition if <sys/disklabel.h> is used on
  its own.

diffstat:

 sys/sys/disklabel.h |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r e6b355426450 -r 786dc291caec sys/sys/disklabel.h
--- a/sys/sys/disklabel.h       Thu Jan 24 22:49:38 2002 +0000
+++ b/sys/sys/disklabel.h       Tue Jan 29 22:16:37 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.60.4.3 2001/10/25 18:05:37 he Exp $    */
+/*     $NetBSD: disklabel.h,v 1.60.4.4 2002/01/29 22:16:37 he Exp $    */
 
 /*
  * Copyright (c) 1987, 1988, 1993
@@ -39,6 +39,13 @@
 #define _SYS_DISKLABEL_H_
 
 /*
+ * We need <machine/types.h> for __HAVE_OLD_DISKLABEL
+ */
+#ifndef _LOCORE
+#include <sys/types.h>
+#endif
+
+/*
  * Each disk has a label which includes information about the hardware
  * disk geometry, filesystem partitions, and drive specific information.
  * The location of the label, as well as the number of partitions the