From dce4fa9e99b9e13683f3969d80b3a50935ca5f32 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Wed, 8 Sep 2004 08:37:38 +0000
Subject: Fix build by solving a namespace collision introduced by libnbcompat.
 I'm doing it the easy way because jlam@ will look at this problem closely in
 a future.

---
 textproc/nbsed/files/defs.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'textproc')

diff --git a/textproc/nbsed/files/defs.h b/textproc/nbsed/files/defs.h
index e898dbc3ebd..5800bca22a1 100644
--- a/textproc/nbsed/files/defs.h
+++ b/textproc/nbsed/files/defs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.4 2004/06/13 13:04:02 grant Exp $	*/
+/*	$NetBSD: defs.h,v 1.5 2004/09/08 08:37:38 jmmv Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)defs.h	8.1 (Berkeley) 6/6/93
- *	$NetBSD: defs.h,v 1.4 2004/06/13 13:04:02 grant Exp $
+ *	$NetBSD: defs.h,v 1.5 2004/09/08 08:37:38 jmmv Exp $
  */
 
 /*-
@@ -70,7 +70,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)defs.h	8.1 (Berkeley) 6/6/93
- *	$NetBSD: defs.h,v 1.4 2004/06/13 13:04:02 grant Exp $
+ *	$NetBSD: defs.h,v 1.5 2004/09/08 08:37:38 jmmv Exp $
  */
 
 /*
@@ -128,6 +128,10 @@ struct s_command {
 	u_int inrange:1;			/* True if in range */
 };
 
+/* XXX This constant is defined by utmpx.h, although we don't need it.
+ * Undefine it to solve a namespace collision until it's better fixed. */
+#undef EMPTY
+
 /*
  * Types of command arguments recognised by the parser
  */
-- 
cgit v1.2.3