pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files/db/hash Don't re-define __U...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d744c4dbba6
branches:  trunk
changeset: 603872:8d744c4dbba6
user:      christos <christos%pkgsrc.org@localhost>
date:      Tue May 15 16:45:45 2012 +0000

description:
Don't re-define __UNCONST if it is already defined. On old NetBSD systems
the definition is a bit different so they bitch.

diffstat:

 pkgtools/libnbcompat/files/db/hash/hash.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 14520cd3a94b -r 8d744c4dbba6 pkgtools/libnbcompat/files/db/hash/hash.c
--- a/pkgtools/libnbcompat/files/db/hash/hash.c Tue May 15 16:43:53 2012 +0000
+++ b/pkgtools/libnbcompat/files/db/hash/hash.c Tue May 15 16:45:45 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hash.c,v 1.3 2010/04/20 00:32:23 joerg Exp $   */
+/*     $NetBSD: hash.c,v 1.4 2012/05/15 16:45:45 christos Exp $        */
 /*     NetBSD: hash.c,v 1.30 2008/09/11 12:58:00 joerg Exp     */
 
 /*-
@@ -36,7 +36,7 @@
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
 
-__RCSID("$NetBSD: hash.c,v 1.3 2010/04/20 00:32:23 joerg Exp $");
+__RCSID("$NetBSD: hash.c,v 1.4 2012/05/15 16:45:45 christos Exp $");
 
 #include <nbcompat/param.h>
 #include <sys/stat.h>
@@ -58,7 +58,9 @@
 #include "../pwrite.c"
 #endif
 
+#ifndef __UNCONST
 #define __UNCONST(a)   ((void *)(size_t)(const void *)(a))
+#endif
 
 static int   alloc_segs(HTAB *, int);
 static int   flush_meta(HTAB *);



Home | Main Index | Thread Index | Old Index