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 · Oct 26, 2015 · 7f3fc93 · 7f3fc93
1 parent 4db7019
commit 7f3fc93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;