switch to <limits.h>; ok millert

diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 5d1fd33..9aadc40 100644 (file)
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: arch.c,v 1.84 2015/01/15 22:08:41 deraadt Exp $ */
+/*     $OpenBSD: arch.c,v 1.85 2015/01/16 15:36:29 deraadt Exp $ */
 /*     $NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $       */
 
 /*
@@ -70,7 +70,6 @@
  *
  */
 
-#include <sys/param.h>
 #include <ar.h>
 #include <assert.h>
 #include <ctype.h>

diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index ced781c..4e9ef7b 100644 (file)
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dir.c,v 1.64 2014/05/12 19:11:19 espie Exp $ */
+/*     $OpenBSD: dir.c,v 1.65 2015/01/16 15:36:29 deraadt Exp $ */
 /*     $NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $        */
 
 /*
@@ -61,7 +61,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <limits.h>

diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 7b2e638..b6a172f 100644 (file)
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.105 2015/01/16 15:17:34 deraadt Exp $ */
+/*     $OpenBSD: main.c,v 1.106 2015/01/16 15:36:30 deraadt Exp $ */
 /*     $NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $    */
 
 /*
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
+#include <sys/param.h> /* MACHINE MACHINE_ARCH */
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef MAKE_BOOTSTRAP

diff --git a/usr.bin/make/targequiv.c b/usr.bin/make/targequiv.c
index 9acf80e..8ab5d67 100644 (file)
--- a/usr.bin/make/targequiv.c
+++ b/usr.bin/make/targequiv.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: targequiv.c,v 1.6 2014/12/07 13:52:17 espie Exp $ */
+/*     $OpenBSD: targequiv.c,v 1.7 2015/01/16 15:36:30 deraadt Exp $ */
 /*
  * Copyright (c) 2007-2008 Marc Espie.
  *
@@ -30,13 +30,13 @@
  * make.
  */
 
-#include <sys/param.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ohash.h>
+#include <limits.h>
 #include "config.h"
 #include "defines.h"
 #include "memory.h"
@@ -190,7 +190,7 @@ attach_node(GNode *gn, GNode *extra)
 }
 
 static char *buffer = NULL;
-static size_t bufsize = MAXPATHLEN;
+static size_t bufsize = PATH_MAX;
 
 static size_t
 parse_reduce(size_t i, const char *src)