diff options
author | sjg <sjg@FreeBSD.org> | 2016-06-08 17:51:21 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2016-06-08 17:51:21 +0000 |
commit | 40b0d2c4e53b744bec6a0948f1445f6083b871ec (patch) | |
tree | 56122b5c8140a0bf6027aed1c35467390a3cfad5 /contrib/bmake/hash.h | |
parent | 9c33c8f38a611cd237ba6ea77def0b0928ddb50e (diff) | |
download | FreeBSD-src-40b0d2c4e53b744bec6a0948f1445f6083b871ec.zip FreeBSD-src-40b0d2c4e53b744bec6a0948f1445f6083b871ec.tar.gz |
Merge bmake-20160606
o dir.c: extend mtimes cache to others via cached_stat()
Diffstat (limited to 'contrib/bmake/hash.h')
-rw-r--r-- | contrib/bmake/hash.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/contrib/bmake/hash.h b/contrib/bmake/hash.h index 31d2ff1..0e3d22d 100644 --- a/contrib/bmake/hash.h +++ b/contrib/bmake/hash.h @@ -1,4 +1,4 @@ -/* $NetBSD: hash.h,v 1.10 2009/01/24 10:59:09 dsl Exp $ */ +/* $NetBSD: hash.h,v 1.11 2016/06/07 00:40:00 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -89,10 +89,7 @@ typedef struct Hash_Entry { struct Hash_Entry *next; /* Used to link together all the * entries associated with the same * bucket. */ - union { - void *clientPtr; /* Arbitrary pointer */ - time_t clientTime; /* Arbitrary Time */ - } clientInfo; + void *clientPtr; /* Arbitrary pointer */ unsigned namehash; /* hash value of key */ char name[1]; /* key string */ } Hash_Entry; @@ -125,8 +122,7 @@ typedef struct Hash_Search { * Hash_Entry *h; */ -#define Hash_GetValue(h) ((h)->clientInfo.clientPtr) -#define Hash_GetTimeValue(h) ((h)->clientInfo.clientTime) +#define Hash_GetValue(h) ((h)->clientPtr) /* * Hash_SetValue(h, val); @@ -134,8 +130,7 @@ typedef struct Hash_Search { * char *val; */ -#define Hash_SetValue(h, val) ((h)->clientInfo.clientPtr = (val)) -#define Hash_SetTimeValue(h, val) ((h)->clientInfo.clientTime = (val)) +#define Hash_SetValue(h, val) ((h)->clientPtr = (val)) /* * Hash_Size(n) returns the number of words in an object of n bytes |