From 7f3fc930723dfe47318475aeb6e8e9c619953062 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 21 Oct 2015 11:54:24 -0400 Subject: [PATCH] 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. --- libarchive/archive.h | 4 ++-- libarchive/archive_endian.h | 2 +- libarchive/archive_entry.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 -#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 #endif @@ -66,7 +66,7 @@ typedef __int64 la_int64_t; # else # include /* 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 -# if defined(_SCO_DS) +# if defined(_SCO_DS) || defined(__osf__) typedef long long la_int64_t; # else typedef int64_t la_int64_t;