===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/dir.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- src/usr.bin/make/dir.c	2005/06/26 15:19:12	1.43
+++ src/usr.bin/make/dir.c	2006/01/20 23:10:19	1.44
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: dir.c,v 1.43 2005/06/26 15:19:12 mickey Exp $ */
+/*	$OpenBSD: dir.c,v 1.44 2006/01/20 23:10:19 espie Exp $ */
 /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
 
 /*
@@ -63,12 +63,12 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
@@ -209,7 +209,7 @@
 static void add_file(Path *, const char *);
 /* n = find_file_hashi(p, name, end, hv): retrieve name in a path hash
  * 	structure. */
-static char *find_file_hashi(Path *, const char *, const char *, u_int32_t);
+static char *find_file_hashi(Path *, const char *, const char *, uint32_t);
 
 /* stamp = find_stampi(name, end): look for (name, end) in the global
  *	cache. */
@@ -280,7 +280,7 @@
 }
 
 static char *
-find_file_hashi(Path *p, const char *file, const char *efile, u_int32_t hv)
+find_file_hashi(Path *p, const char *file, const char *efile, uint32_t hv)
 {
     struct ohash 	*h = &p->files;
 
@@ -646,7 +646,7 @@
     bool		hasSlash;
     struct stat 	stb;	/* Buffer for stat, if necessary */
     struct file_stamp	*entry; /* Entry for mtimes table */
-    u_int32_t		hv;	/* hash value for last component in file name */
+    uint32_t		hv;	/* hash value for last component in file name */
     char		*q;	/* Str_dupi(name, ename) */
 
     /* Find the final component of the name and note whether name has a