From: dtrg <none@none>
Date: Fri, 21 Jul 2006 10:35:34 +0000 (+0000)
Subject: Removed a definition of 'struct label' as 'label_t', as it clashes with
X-Git-Tag: release-6-0-pre-1~112
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=db0b62849737ad6346dfb4d12f2adfd39d0d62db;p=ack.git

Removed a definition of 'struct label' as 'label_t', as it clashes with
a common Posix extension on BSD systems.
---

diff --git a/mach/proto/ncg/label.c b/mach/proto/ncg/label.c
index 9c8c9726f..88e36ee2e 100644
--- a/mach/proto/ncg/label.c
+++ b/mach/proto/ncg/label.c
@@ -15,7 +15,7 @@ add_label(num, height, flth)
 	if (flth != TRUE && flth != FALSE)
 	    fatal("incorrect value for fallthrough");
 
-	lbl = (label_p) myalloc(sizeof(label_t));
+	lbl = (label_p) myalloc(sizeof(struct label));
 	lbl->lb_next = label_list;
 	lbl->lb_number = num;
 	lbl->lb_height = height;
diff --git a/mach/proto/ncg/label.h b/mach/proto/ncg/label.h
index 3eed673d5..96c290be6 100644
--- a/mach/proto/ncg/label.h
+++ b/mach/proto/ncg/label.h
@@ -7,11 +7,11 @@
 
 typedef struct label *label_p;
 
-typedef struct label {
+struct label {
 	label_p	lb_next;
 	word	lb_number;
 	int	lb_height;
 	short	lb_fallthrough;
-    } label_t;
+};
 
 extern label_p get_label();