--- Libc/Libc-583/gen/disklabel.c
+++ Libc/Libc-262/gen/disklabel.c
@@ -1,22 +1,21 @@
 /*
- * Copyright (c) 1999, 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -58,9 +57,8 @@
 #include <sys/time.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
-/* from ufs/ffs/fs.h */
-#define BBSIZE		8192
-#define SBSIZE		8192
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -70,10 +68,8 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#ifdef unused
-static int	error(int);
-#endif // unused
-static int	gettype(char *, char **);
+static int	error __P((int));
+static int	gettype __P((char *, char **));
 
 struct disklabel *
 getdiskbyname(name)
@@ -193,7 +189,6 @@
 	return (0);
 }
 
-#ifdef unused
 static int
 error(err)
 	int err;
@@ -207,4 +202,3 @@
 	(void)write(STDERR_FILENO, p, strlen(p));
 	(void)write(STDERR_FILENO, "\n", 1);
 }
-#endif // unused