From 7dba0d668f4abcf39b3b828d89ea813ebc316152 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 20 Dec 2011 13:53:16 -0500
Subject: [PATCH] libarchive: Port to OSF operating system

Make changes equivalent to those originally made by commits

  bd56626a (Fixes for the OSF operating system build, 2010-09-08)
  92c082b1 (Add a fix for the inline keyword on the osf os, 2010-09-10)

but based on the updated libarchive snapshot.
---
 Utilities/cmlibarchive/build/cmake/config.h.in     | 3 +++
 Utilities/cmlibarchive/libarchive/archive.h        | 4 ++--
 Utilities/cmlibarchive/libarchive/archive_endian.h | 2 +-
 Utilities/cmlibarchive/libarchive/archive_entry.h  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in b/Utilities/cmlibarchive/build/cmake/config.h.in
index b1690515d7..b404be37ed 100644
--- a/Utilities/cmlibarchive/build/cmake/config.h.in
+++ b/Utilities/cmlibarchive/build/cmake/config.h.in
@@ -1,4 +1,7 @@
 /* config.h.  Generated from build/cmake/config.h.in by cmake configure */
+#if defined(__osf__)
+# define _OSF_SOURCE
+#endif
 
 /*
  * Ensure we have C99-style int64_t, etc, all defined.
diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h
index 14c2aed989..75475ca4c9 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -41,7 +41,7 @@
  */
 #if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
 # include <stdint.h>
-#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS)
+#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS) && !defined(__osf__)
 # include <inttypes.h>
 #endif
 
@@ -65,7 +65,7 @@
 # endif
 #else
 # include <unistd.h>  /* ssize_t, uid_t, and gid_t */
-# if defined(_SCO_DS)
+# if defined(_SCO_DS) || defined(__osf__)
 #  define	__LA_INT64_T	long long
 # else
 #  define	__LA_INT64_T	int64_t
diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h
index edc90ee6a8..1dd8536c48 100644
--- a/Utilities/cmlibarchive/libarchive/archive_endian.h
+++ b/Utilities/cmlibarchive/libarchive/archive_endian.h
@@ -47,7 +47,7 @@
  */
 #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__)
 #define	inline
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__osf__)
 #define inline __inline
 #endif
 
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h b/Utilities/cmlibarchive/libarchive/archive_entry.h
index fcd76573c1..906779a822 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.h
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.h
@@ -64,7 +64,7 @@
 # endif
 #else
 #include <unistd.h>
-# if defined(_SCO_DS)
+# if defined(_SCO_DS) || defined(__osf__)
 #  define	__LA_INT64_T	long long
 # else
 #  define	__LA_INT64_T	int64_t