*** empty log message ***

[chaz/tar] / src / port.h

diff --git a/src/port.h b/src/port.h
index 481f36ab3f4aaefbf80e85e5fa37e5fc144b1543..fa4b8793bdb26d21528dd69cc7eee33d52078bbc 100644 (file)
--- a/src/port.h
+++ b/src/port.h
@@ -1,5 +1,5 @@
 /* Portability declarations.  Requires sys/types.h.
-   Copyright (C) 1988 Free Software Foundation
+   Copyright (C) 1988, 1992 Free Software Foundation
 
 This file is part of GNU Tar.
 
@@ -17,11 +17,22 @@ You should have received a copy of the GNU General Public License
 along with GNU Tar; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "pathmax.h"
-
+/* AIX requires this to be the first thing in the file. */
 #ifdef __GNUC__
 #define alloca __builtin_alloca
-#endif
+#else /* not __GNUC__ */
+#if HAVE_ALLOCA_H
+#include <alloca.h>
+#else /* not HAVE_ALLOCA_H */
+#ifdef _AIX
+ #pragma alloca
+#else /* not _AIX */
+char *alloca ();
+#endif /* not _AIX */
+#endif /* not HAVE_ALLOCA_H */
+#endif /* not __GNUC__ */
+
+#include "pathmax.h"
 
 #ifdef _POSIX_VERSION
 #include <sys/wait.h>
@@ -57,7 +68,6 @@ typedef long off_t;
 #define PTR void *
 #else
 #define PTR char *
-#define const
 #endif
 
 /* Since major is a function on SVR4, we can't just use `ifndef major'.  */
@@ -87,6 +97,12 @@ typedef long off_t;
 #if !defined(__MSDOS__) && !defined(STDC_HEADERS)
 #include <memory.h>
 #endif
+#ifdef index
+#undef index
+#endif
+#ifdef rindex
+#undef rindex
+#endif
 #define index strchr
 #define rindex strrchr
 #define bcopy(s, d, n) memcpy(d, s, n)