Module Name: src
Committed By: christos
Date: Tue Jun 2 21:15:53 UTC 2009
Modified Files:
src/sbin/fdisk: fdisk.c
Log Message:
make this compile one non mbr machines (move #define to the general section)
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sbin/fdisk/fdisk.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/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.121 src/sbin/fdisk/fdisk.c:1.122
--- src/sbin/fdisk/fdisk.c:1.121 Mon Jun 1 15:57:33 2009
+++ src/sbin/fdisk/fdisk.c Tue Jun 2 17:15:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.121 2009/06/01 19:57:33 christos Exp $ */
+/* $NetBSD: fdisk.c,v 1.122 2009/06/02 21:15:53 christos Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.121 2009/06/01 19:57:33 christos Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.122 2009/06/02 21:15:53 christos Exp $");
#endif /* not lint */
#define MBRPTYPENAMES
@@ -109,7 +109,6 @@
#define SCAN_F1 0x3b
#define SCAN_1 0x2
-#define GPT_TYPE(offs) ((offs) == GPT_HDR_BLKNO ? "primary" : "secondary")
#define MAX_BIOS_DISKS 16 /* Going beyond F12 is hard though! */
@@ -119,6 +118,8 @@
#endif
+#define GPT_TYPE(offs) ((offs) == GPT_HDR_BLKNO ? "primary" : "secondary")
+
#define LBUF 100
static char lbuf[LBUF];
