Sync with NetBSD:

- Merge in FreeBSD and Lite2 changes.
- Fix bug where a non-archive target with a .a suffix would always
  be considered to be out of date, since it does not have a TOC.
- Fix NetBSD PR #2930: declare missing variable.

1 files changed, 13 insertions, 13 deletions

diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index b3fd39ebfc7..92111641e2a 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: hash.h,v 1.2 1996/06/26 05:36:31 deraadt Exp $	*/
-/*	$NetBSD: hash.h,v 1.4 1995/06/14 15:19:18 christos Exp $	*/
+/*	$OpenBSD: hash.h,v 1.3 1996/11/30 21:08:55 millert Exp $	*/
+/*	$NetBSD: hash.h,v 1.5 1996/11/06 17:59:07 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)hash.h	5.4 (Berkeley) 12/28/90
+ *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
  */
 
 /* hash.h --
@@ -50,7 +50,7 @@
 #ifndef	_HASH
 #define	_HASH
 
-/* 
+/*
  * The following defines one entry in the hash table.
  */
 
@@ -72,7 +72,7 @@ typedef struct Hash_Table {
     int 	mask;		/* Used to select bits for hashing. */
 } Hash_Table;
 
-/* 
+/*
  * The following structure is used by the searching routines
  * to record where we are in the search.
  */
@@ -88,22 +88,22 @@ typedef struct Hash_Search {
  */
 
 /*
- * ClientData Hash_GetValue(h) 
- *     Hash_Entry *h; 
+ * ClientData Hash_GetValue(h)
+ *     Hash_Entry *h;
  */
 
 #define Hash_GetValue(h) ((h)->clientData)
 
-/* 
- * Hash_SetValue(h, val); 
- *     Hash_Entry *h; 
- *     char *val; 
+/*
+ * Hash_SetValue(h, val);
+ *     Hash_Entry *h;
+ *     char *val;
  */
 
 #define Hash_SetValue(h, val) ((h)->clientData = (ClientData) (val))
 
-/* 
- * Hash_Size(n) returns the number of words in an object of n bytes 
+/*
+ * Hash_Size(n) returns the number of words in an object of n bytes
  */
 
 #define	Hash_Size(n)	(((n) + sizeof (int) - 1) / sizeof (int))