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.
This commit is contained in:
Brad King 2011-12-20 13:53:16 -05:00
parent 0f7a85349a
commit 7dba0d668f
4 changed files with 7 additions and 4 deletions

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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