From owner-p4-projects  Sun May 26 20:11:41 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BF3937B405; Sun, 26 May 2002 20:11:35 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9AC4D37B400
	for <perforce@freebsd.org>; Sun, 26 May 2002 20:11:34 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4R3BYH02497
	for perforce@freebsd.org; Sun, 26 May 2002 20:11:34 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Date: Sun, 26 May 2002 20:11:34 -0700 (PDT)
Message-Id: <200205270311.g4R3BYH02497@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 11949 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11949

Change 11949 by marcel@marcel_nfs on 2002/05/26 20:10:41

	o  Include gpt.h from /usr/include/sys.
	o  Nuke private copy of gpt.h.

Affected files ...

... //depot/projects/ia64/sbin/gpt/gpt.c#6 edit
... //depot/projects/ia64/sbin/gpt/gpt.h#3 delete

Differences ...

==== //depot/projects/ia64/sbin/gpt/gpt.c#6 (text+ko) ====

@@ -57,6 +57,7 @@
 #include <sys/disk.h>
 #include <sys/stat.h>
 #include <sys/uuid.h>
+#include <sys/gpt.h>
 
 #include <err.h>
 #include <errno.h>
@@ -66,7 +67,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "gpt.h"
 #include "map.h"
 
 struct mbr {
@@ -507,8 +507,8 @@
 	for (i = 0; i < 4; i++) {
 		switch (mbr->mbr_part[i].part_typ) {
 		case 165: {	/* FreeBSD */
-			uuid_t freebsd_slice = GPT_ENT_TYPE_FREEBSD_SLICE;
-			ent->ent_type = freebsd_slice;
+			uuid_t freebsd = GPT_ENT_TYPE_FREEBSD;
+			ent->ent_type = freebsd;
 			unicode16(ent->ent_name,
 			    L"FreeBSD disklabel partition", 36);
 			break;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message