Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sbin/gpt/set.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sbin/gpt/set.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -p -r1.2 -r1.2.6.1
--- src/sbin/gpt/set.c	2013/12/10 01:05:00	1.2
+++ src/sbin/gpt/set.c	2015/06/02 19:49:38	1.2.6.1
@@ -24,12 +24,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: set.c,v 1.2 2013/12/10 01:05:00 jnemeth Exp $");
+__RCSID("$NetBSD: set.c,v 1.2.6.1 2015/06/02 19:49:38 snj Exp $");
 #endif
 
 #include <sys/types.h>
@@ -40,7 +44,6 @@ __RCSID("$NetBSD: set.c,v 1.2 2013/12/10
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <inttypes.h>
 
 #include "map.h"
 #include "gpt.h"
@@ -62,7 +65,6 @@ usage_set(void)
 static void
 set(int fd)
 {
-	uuid_t uuid;
 	map_t *gpt, *tpg;
 	map_t *tbl, *lbt;
 	struct gpt_hdr *hdr;
@@ -102,8 +104,7 @@ set(int fd)
 	i = entry - 1;
 	ent = (void*)((char*)tbl->map_data + i *
 	    le32toh(hdr->hdr_entsz));
-	le_uuid_dec(ent->ent_type, &uuid);
-	if (uuid_is_nil(&uuid, NULL)) {
+	if (gpt_uuid_is_nil(ent->ent_type)) {
 		warnx("%s: error: entry at index %u is unused",
 		    device_name, entry);
 		return;