$NetBSD: patch-aa,v 1.13 2011/02/06 12:09:50 obache Exp $

--- make.h.orig	2010-07-20 13:12:06.000000000 +0000
+++ make.h
@@ -36,7 +36,7 @@ this program.  If not, see <http://www.g
  #pragma alloca
 # else
 #  if !defined(__GNUC__) && !defined(WINDOWS32)
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
+#   if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */
 char *alloca ();
 #   endif
 #  endif
@@ -249,6 +249,9 @@ char *strerror (int errnum);
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #define FILE_TIMESTAMP uintmax_t
 
 #if !defined(HAVE_STRSIGNAL)
@@ -472,7 +475,7 @@ long int lseek ();
 #endif  /* Not GNU C library or POSIX.  */
 
 #ifdef  HAVE_GETCWD
-# if !defined(VMS) && !defined(__DECC)
+# if !defined(VMS) && !defined(__DECC) && !defined(HAVE_UNISTD_H)
 char *getcwd ();
 # endif
 #else