Module Name: src
Committed By: christos
Date: Mon Sep 29 22:22:03 UTC 2014
Modified Files:
src/sbin/gpt: backup.c gpt.h migrate.c show.c
Log Message:
more toolification changes
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/gpt/backup.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/gpt/gpt.h
cvs rdiff -u -r1.16 -r1.17 src/sbin/gpt/migrate.c src/sbin/gpt/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/backup.c
diff -u src/sbin/gpt/backup.c:1.5 src/sbin/gpt/backup.c:1.6
--- src/sbin/gpt/backup.c:1.5 Mon Sep 29 17:04:34 2014
+++ src/sbin/gpt/backup.c Mon Sep 29 18:22:03 2014
@@ -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 @@ __RCSID("$NetBSD: backup.c,v 1.5 2014/09
#include <string.h>
#include <unistd.h>
#include <prop/proplib.h>
-#endif
#include "map.h"
#include "gpt.h"
Index: src/sbin/gpt/gpt.h
diff -u src/sbin/gpt/gpt.h:1.13 src/sbin/gpt/gpt.h:1.14
--- src/sbin/gpt/gpt.h:1.13 Sun Sep 28 04:14:51 2014
+++ src/sbin/gpt/gpt.h Mon Sep 29 18:22:03 2014
@@ -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
Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.16 src/sbin/gpt/migrate.c:1.17
--- src/sbin/gpt/migrate.c:1.16 Mon Sep 29 17:04:34 2014
+++ src/sbin/gpt/migrate.c Mon Sep 29 18:22:03 2014
@@ -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>
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.16 src/sbin/gpt/show.c:1.17
--- src/sbin/gpt/show.c:1.16 Mon Sep 29 16:28:57 2014
+++ src/sbin/gpt/show.c Mon Sep 29 18:22:03 2014
@@ -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 @@ show_one(void)
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)
