[src/trunk]: src/sbin/gpt more toolification changes

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

details:   https://anonhg.NetBSD.org/src/rev/1bc96eab56c0
branches:  trunk
changeset: 332586:1bc96eab56c0
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Sep 29 22:22:03 2014 +0000

description:
more toolification changes

diffstat:

 sbin/gpt/backup.c  |  3 +--
 sbin/gpt/gpt.h     |  4 ++++
 sbin/gpt/migrate.c |  7 ++++++-
 sbin/gpt/show.c    |  4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r a135fb83f2f2 -r 1bc96eab56c0 sbin/gpt/backup.c
--- a/sbin/gpt/backup.c Mon Sep 29 21:45:15 2014 +0000
+++ b/sbin/gpt/backup.c Mon Sep 29 22:22:03 2014 +0000
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: backup.c,v 1.5 2014/09/29 21:04:34 christos Exp $");
+__RCSID("$NetBSD: backup.c,v 1.6 2014/09/29 22:22:03 christos Exp $");
 #endif
 
 #include <sys/bootblock.h>
@@ -46,7 +46,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <prop/proplib.h>
-#endif
 
 #include "map.h"
 #include "gpt.h"
diff -r a135fb83f2f2 -r 1bc96eab56c0 sbin/gpt/gpt.h
--- a/sbin/gpt/gpt.h    Mon Sep 29 21:45:15 2014 +0000
+++ b/sbin/gpt/gpt.h    Mon Sep 29 22:22:03 2014 +0000
@@ -30,7 +30,11 @@
 #define        _GPT_H_
 
 #include <sys/endian.h>
+#ifndef HAVE_NBTOOL_CONFIG_H
 #include <sys/disklabel_gpt.h>
+#else
+#include <nbinclude/sys/disklabel_gpt.h>
+#endif
 #define GPT_SIZE GPT_HDR_SIZE
 #define hdr_uuid hdr_guid
 #define ent_uuid ent_guid
diff -r a135fb83f2f2 -r 1bc96eab56c0 sbin/gpt/migrate.c
--- a/sbin/gpt/migrate.c        Mon Sep 29 21:45:15 2014 +0000
+++ b/sbin/gpt/migrate.c        Mon Sep 29 22:22:03 2014 +0000
@@ -33,13 +33,18 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: migrate.c,v 1.16 2014/09/29 21:04:34 christos Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.17 2014/09/29 22:22:03 christos Exp $");
 #endif
 
 #include <sys/types.h>
 #include <sys/param.h>
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/sys/bootblock.h>
+#include <nbinclude/sys/disklabel.h>
+#else
 #include <sys/bootblock.h>
 #include <sys/disklabel.h>
+#endif
 
 #include <err.h>
 #include <stddef.h>
diff -r a135fb83f2f2 -r 1bc96eab56c0 sbin/gpt/show.c
--- a/sbin/gpt/show.c   Mon Sep 29 21:45:15 2014 +0000
+++ b/sbin/gpt/show.c   Mon Sep 29 22:22:03 2014 +0000
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.16 2014/09/29 20:28:57 christos Exp $");
+__RCSID("$NetBSD: show.c,v 1.17 2014/09/29 22:22:03 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -229,7 +229,7 @@
        const char *s1;
        char *s2;
 #ifdef HN_AUTOSCALE
-       char *human_num[5];
+       char human_num[5];
 #endif
 
        for (m = map_first(); m != NULL; m = m->map_next)