From: Brad King <brad.king@kitware.com>
Date: Wed, 21 Oct 2015 15:54:24 +0000 (-0400)
Subject: Port main library code to OSF operating system
X-Git-Tag: v3.1.900a~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f3fc930723dfe47318475aeb6e8e9c619953062;p=thirdparty%2Flibarchive.git

Port main library code to OSF operating system

Add preprocessor conditionals using '__osf__' as needed to build the
main library.  Do not try to port the tests or executables yet.
---

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 4724c0d4f..676ab3fdc 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -51,7 +51,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
 
@@ -66,7 +66,7 @@
 typedef __int64 la_int64_t;
 # else
 # include <unistd.h>  /* ssize_t */
-#  if defined(_SCO_DS)
+#  if defined(_SCO_DS) || defined(__osf__)
 typedef long long la_int64_t;
 #  else
 typedef int64_t la_int64_t;
diff --git a/libarchive/archive_endian.h b/libarchive/archive_endian.h
index a656405f1..1c48563b1 100644
--- a/libarchive/archive_endian.h
+++ b/libarchive/archive_endian.h
@@ -53,7 +53,7 @@
 #define	inline
 #elif defined(__SUNPRO_C) && __SUNPRO_C < 0x590
 #define inline
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined(__osf__)
 #define inline __inline
 #endif
 
diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index 996d60f4b..067409263 100644
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -57,7 +57,7 @@
 typedef __int64 la_int64_t;
 # else
 #include <unistd.h>
-#  if defined(_SCO_DS)
+#  if defined(_SCO_DS) || defined(__osf__)
 typedef long long la_int64_t;
 #  else
 typedef int64_t la_int64_t;