===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/dir.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- src/usr.bin/make/dir.c	2012/12/07 07:15:31	1.61
+++ src/usr.bin/make/dir.c	2013/04/23 14:32:53	1.62
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.61 2012/12/07 07:15:31 espie Exp $ */
+/*	$OpenBSD: dir.c,v 1.62 2013/04/23 14:32:53 espie Exp $ */
 /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
 
 /*
@@ -66,13 +66,13 @@
 #include <dirent.h>
 #include <limits.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ohash.h>
 #include "config.h"
 #include "defines.h"
-#include "ohash.h"
 #include "dir.h"
 #include "lst.h"
 #include "memory.h"
@@ -196,7 +196,7 @@
  * entry, and we don't look up in this cache except as a last resort.
  */
 struct file_stamp {
-	TIMESTAMP mtime;		/* time stamp... */
+	struct timespec mtime;		/* time stamp... */
 	char name[1];			/* ...for that file.  */
 };
 
@@ -228,7 +228,7 @@
 static struct file_stamp *find_stampi(const char *, const char *);
 /* record_stamp(name, timestamp): record timestamp for name in the global
  * 	cache. */
-static void record_stamp(const char *, TIMESTAMP);
+static void record_stamp(const char *, struct timespec);
 
 static bool read_directory(struct PathEntry *);
 /* p = DirReaddiri(name, end): read an actual directory, caching results
@@ -242,7 +242,7 @@
  ***/
 
 static void
-record_stamp(const char *file, TIMESTAMP t)
+record_stamp(const char *file, struct timespec t)
 {
 	unsigned int slot;
 	const char *end = NULL;
@@ -548,7 +548,7 @@
 				printf("checking %s...", file);
 
 			if (stat(file, &stb) == 0) {
-				TIMESTAMP mtime;
+				struct timespec mtime;
 
 				ts_set_from_stat(stb, mtime);
 				if (DEBUG(DIR))
@@ -610,7 +610,7 @@
 			printf("got it (in mtime cache)\n");
 		return q;
 	} else if (stat(q, &stb) == 0) {
-		TIMESTAMP mtime;
+		struct timespec mtime;
 
 		ts_set_from_stat(stb, mtime);
 		if (DEBUG(DIR))
@@ -694,14 +694,14 @@
 	Lst_Every(path, DirPrintDir);
 }
 
-TIMESTAMP
+struct timespec
 Dir_MTime(GNode *gn)
 {
 	char *fullName;
 	struct stat stb;
 	struct file_stamp *entry;
 	unsigned int slot;
-	TIMESTAMP	  mtime;
+	struct timespec	  mtime;
 
 	if (gn->type & OP_PHONY)
 		return gn->mtime;