Merge commit 'upstream/2.20'

[msp430-binutils.git] / binutils / sysdep.h

diff --git a/binutils/sysdep.h b/binutils/sysdep.h
index 3ac45fa4cf02289c6086b0f3d570e08c046ae275..e573637b8c72563836d063d33af672fdd09daeb1 100644 (file)
--- a/binutils/sysdep.h
+++ b/binutils/sysdep.h
@@ -1,6 +1,7 @@
 /* sysdep.h -- handle host dependencies for binutils
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -21,12 +22,12 @@
 #ifndef _BIN_SYSDEP_H
 #define _BIN_SYSDEP_H
 
+#include "alloca-conf.h"
 #include "ansidecl.h"
 #include <stdio.h>
 #include <sys/types.h>
 
 #include "bfdver.h"
-#include "config.h"
 
 #include <stdarg.h>
 
@@ -68,6 +69,8 @@ extern char *strrchr ();
 #endif
 #endif
 
+#include "binary-io.h"
+
 #if !HAVE_DECL_STPCPY
 extern char *stpcpy (char *, const char *);
 #endif
@@ -120,23 +123,6 @@ extern int vsnprintf(char *, size_t, const char *, va_list);
 #define SEEK_END 2
 #endif
 
-#if defined(__GNUC__) && !defined(C_ALLOCA)
-# undef alloca
-# define alloca __builtin_alloca
-#else
-# if defined(HAVE_ALLOCA_H) && !defined(C_ALLOCA)
-#  include <alloca.h>
-# else
-#  ifndef alloca /* predefined by HP cc +Olibcalls */
-#   if !defined (__STDC__) && !defined (__hpux)
-char *alloca ();
-#   else
-void *alloca ();
-#   endif /* __STDC__, __hpux */
-#  endif /* alloca */
-# endif /* HAVE_ALLOCA_H */
-#endif
-
 #ifdef HAVE_LOCALE_H
 # ifndef ENABLE_NLS
    /* The Solaris version of locale.h always includes libintl.h.  If we have
@@ -171,4 +157,23 @@ void *alloca ();
 /* Used by ar.c and objcopy.c.  */
 #define BUFSIZE 8192
 
+/* For PATH_MAX.  */
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifndef PATH_MAX
+/* For MAXPATHLEN.  */
+# ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+# endif
+# ifndef PATH_MAX
+#  ifdef MAXPATHLEN
+#   define PATH_MAX MAXPATHLEN
+#  else
+#   define PATH_MAX 1024
+#  endif
+# endif
+#endif
+
 #endif /* _BIN_SYSDEP_H */