--- Libc/Libc-262.2.12/gen/disklabel.c
+++ Libc/Libc-583/gen/disklabel.c
@@ -1,9 +1,7 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2008 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -60,8 +58,9 @@
 #include <sys/time.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+/* from ufs/ffs/fs.h */
+#define BBSIZE		8192
+#define SBSIZE		8192
 
 #include <errno.h>
 #include <fcntl.h>
@@ -71,8 +70,10 @@
 #include <unistd.h>
 #include <ctype.h>
 
-static int	error __P((int));
-static int	gettype __P((char *, char **));
+#ifdef unused
+static int	error(int);
+#endif // unused
+static int	gettype(char *, char **);
 
 struct disklabel *
 getdiskbyname(name)
@@ -192,6 +193,7 @@
 	return (0);
 }
 
+#ifdef unused
 static int
 error(err)
 	int err;
@@ -205,3 +207,4 @@
 	(void)write(STDERR_FILENO, p, strlen(p));
 	(void)write(STDERR_FILENO, "\n", 1);
 }
+#endif // unused