pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/nbsed/files Fix build by solving a namespace ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d591583dfddf
branches:  trunk
changeset: 480385:d591583dfddf
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Sep 08 08:37:38 2004 +0000

description:
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.

diffstat:

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

diffs (38 lines):

diff -r 3e8835600aeb -r d591583dfddf textproc/nbsed/files/defs.h
--- a/textproc/nbsed/files/defs.h       Wed Sep 08 08:02:00 2004 +0000
+++ b/textproc/nbsed/files/defs.h       Wed Sep 08 08:37:38 2004 +0000
@@ -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 @@
        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
  */



Home | Main Index | Thread Index | Old Index