Sat Feb 27 16:27:00 2010 UTC ()
BSIZE and BSHIFT are defined by sys/param.h on HP-UX, so undef them
first.


(joerg)
diff -r1.2 -r1.3 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h (expand / switch to unified diff)

--- pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h 2008/10/28 15:06:26 1.2
+++ pkgsrc/pkgtools/libnbcompat/files/db/hash/hash.h 2010/02/27 16:27:00 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hash.h,v 1.2 2008/10/28 15:06:26 joerg Exp $ */ 1/* $NetBSD: hash.h,v 1.3 2010/02/27 16:27:00 joerg Exp $ */
2/* NetBSD: hash.h,v 1.15 2008/08/26 21:18:38 joerg Exp */ 2/* NetBSD: hash.h,v 1.15 2008/08/26 21:18:38 joerg Exp */
3 3
4/*- 4/*-
5 * Copyright (c) 1990, 1993, 1994 5 * Copyright (c) 1990, 1993, 1994
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to Berkeley by 8 * This code is derived from software contributed to Berkeley by
9 * Margo Seltzer. 9 * Margo Seltzer.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -264,26 +264,28 @@ typedef struct htab { /* Memory reside @@ -264,26 +264,28 @@ typedef struct htab { /* Memory reside
264 * OVFLPAGE -- 0 264 * OVFLPAGE -- 0
265 * 265 *
266 * OVFL_PAGENO and OVFLPAGE are optional (they are 266 * OVFL_PAGENO and OVFLPAGE are optional (they are
267 * not present if there is no next page). 267 * not present if there is no next page).
268 */ 268 */
269 269
270#define OVFLPAGE 0 270#define OVFLPAGE 0
271#define PARTIAL_KEY 1 271#define PARTIAL_KEY 1
272#define FULL_KEY 2 272#define FULL_KEY 2
273#define FULL_KEY_DATA 3 273#define FULL_KEY_DATA 3
274#define REAL_KEY 4 274#define REAL_KEY 4
275 275
276/* Short hands for accessing structure */ 276/* Short hands for accessing structure */
 277#undef BSIZE
 278#undef BSHIFT
277#define BSIZE hdr.bsize 279#define BSIZE hdr.bsize
278#define BSHIFT hdr.bshift 280#define BSHIFT hdr.bshift
279#define DSIZE hdr.dsize 281#define DSIZE hdr.dsize
280#define SGSIZE hdr.ssize 282#define SGSIZE hdr.ssize
281#define SSHIFT hdr.sshift 283#define SSHIFT hdr.sshift
282#define LORDER hdr.lorder 284#define LORDER hdr.lorder
283#define OVFL_POINT hdr.ovfl_point 285#define OVFL_POINT hdr.ovfl_point
284#define LAST_FREED hdr.last_freed 286#define LAST_FREED hdr.last_freed
285#define MAX_BUCKET hdr.max_bucket 287#define MAX_BUCKET hdr.max_bucket
286#define FFACTOR hdr.ffactor 288#define FFACTOR hdr.ffactor
287#define HIGH_MASK hdr.high_mask 289#define HIGH_MASK hdr.high_mask
288#define LOW_MASK hdr.low_mask 290#define LOW_MASK hdr.low_mask
289#define NKEYS hdr.nkeys 291#define NKEYS hdr.nkeys