Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more toolification changes

This commit is contained in:
christos 2014-09-29 22:22:03 +00:00
parent 1a90426b3c
commit 4da1cfa89d
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/gpt/backup.c
View File

@ -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/29 21:04:34 christos Exp $");
#include <string.h>
#include <unistd.h>
#include <prop/proplib.h>
#endif
#include "map.h"
#include "gpt.h"

4
sbin/gpt/gpt.h
View File

@ -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

7
sbin/gpt/migrate.c
View File

@ -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>

4
sbin/gpt/show.c
View File

@ -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)