kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix_osf_build' 

92c082b Add a fix for the inline keyword on the osf os.
bd56626 Fixes for the OSF operating system build.
This commit is contained in:
David Cole 2010-11-09 15:53:55 -05:00 committed by CMake Topic Stage
parent 385b681138 92c082b1c9
commit 745671441d
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Utilities/cmlibarchive/CMakeLists.txt
View File

@ -512,6 +512,8 @@ CHECK_TYPE_SIZE(int64_t INT64_T)
IF(NOT HAVE_INT64_T) IF(NOT HAVE_INT64_T)
IF(WIN32) IF(WIN32)
SET(int64_t "__int64") SET(int64_t "__int64")
ELSE(WIN32)
SET(int64_t "long long")
ENDIF(WIN32) ENDIF(WIN32)
ENDIF(NOT HAVE_INT64_T) ENDIF(NOT HAVE_INT64_T)
# #
@ -568,9 +570,7 @@ ENDIF(NOT HAVE_UINT16_T)
# #
CHECK_TYPE_SIZE(uint32_t UINT32_T) CHECK_TYPE_SIZE(uint32_t UINT32_T)
IF(NOT HAVE_UINT32_T) IF(NOT HAVE_UINT32_T)
IF(WIN32) SET(uint32_t "unsigned int")
SET(uint32_t "unsigned int")
ENDIF(WIN32)
ENDIF(NOT HAVE_UINT32_T) ENDIF(NOT HAVE_UINT32_T)
CHECK_TYPE_SIZE(int32_t INT32_T) CHECK_TYPE_SIZE(int32_t INT32_T)
IF(NOT HAVE_INT32_T) IF(NOT HAVE_INT32_T)
@ -581,6 +581,8 @@ CHECK_TYPE_SIZE(uint64_t UINT64_T)
IF(NOT HAVE_UINT64_T) IF(NOT HAVE_UINT64_T)
IF(WIN32) IF(WIN32)
SET(uint64_t "unsigned __int64") SET(uint64_t "unsigned __int64")
ELSE(WIN32)
SET(uint64_t "unsigned long long")
ENDIF(WIN32) ENDIF(WIN32)
ENDIF(NOT HAVE_UINT64_T) ENDIF(NOT HAVE_UINT64_T)
# #

3
Utilities/cmlibarchive/build/cmake/config.h.in
View File

@ -1,4 +1,7 @@
/* config.h. Generated from config.h.cmake by cmake configure */ /* config.h. Generated from config.h.cmake by cmake configure */
#if defined(__osf__)
# define _OSF_SOURCE
#endif
/* Version number of bsdcpio */ /* Version number of bsdcpio */
#cmakedefine BSDCPIO_VERSION_STRING "${BSDCPIO_VERSION_STRING}" #cmakedefine BSDCPIO_VERSION_STRING "${BSDCPIO_VERSION_STRING}"

8
Utilities/cmlibarchive/libarchive/archive.h
View File

@ -37,7 +37,7 @@
*/ */
#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560 #if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
# define __LA_STDINT_H <stdint.h> # define __LA_STDINT_H <stdint.h>
#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) #elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(__osf__)
# define __LA_STDINT_H <inttypes.h> # define __LA_STDINT_H <inttypes.h>
#endif #endif
@ -68,7 +68,11 @@
# endif # endif
#else #else
#include <unistd.h> /* ssize_t, uid_t, and gid_t */ #include <unistd.h> /* ssize_t, uid_t, and gid_t */
#define __LA_INT64_T int64_t #if defined(__osf__)
# define __LA_INT64_T long long
#else
# define __LA_INT64_T int64_t
#endif
#define __LA_SSIZE_T ssize_t #define __LA_SSIZE_T ssize_t
#define __LA_UID_T uid_t #define __LA_UID_T uid_t
#define __LA_GID_T gid_t #define __LA_GID_T gid_t

2
Utilities/cmlibarchive/libarchive/archive_endian.h
View File

@ -48,7 +48,7 @@
*/ */
#if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) || defined(__SUNPRO_C) #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) || defined(__SUNPRO_C)
#define inline #define inline
#elif defined(_MSC_VER) #elif defined(_MSC_VER) || defined(__osf__)
#define inline __inline #define inline __inline
#endif #endif

6
Utilities/cmlibarchive/libarchive/archive_entry.h
View File

@ -61,7 +61,11 @@
# endif # endif
#else #else
# include <unistd.h> # include <unistd.h>
#define __LA_INT64_T int64_t #ifdef __osf__
# define __LA_INT64_T long long
#else
# define __LA_INT64_T int64_t
#endif
#define __LA_UID_T uid_t #define __LA_UID_T uid_t
#define __LA_GID_T gid_t #define __LA_GID_T gid_t
#define __LA_DEV_T dev_t #define __LA_DEV_T dev_t