diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-09 20:53:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-09 20:53:55 (GMT) |
| commit | 745671441d3bcecac171334da350e92ab8b5f7b9 (patch) | |
| tree | baf116f89fcabe134985ad3492a52d1503870457 /Utilities/cmlibarchive/libarchive/archive_endian.h | |
| parent | 385b681138b5e185bf50e4ee1d54f3b57e229fdd (diff) | |
| parent | 92c082b1c9269a2fcbb9472b02adb3dd57a283ea (diff) | |
| download | CMake-745671441d3bcecac171334da350e92ab8b5f7b9.zip CMake-745671441d3bcecac171334da350e92ab8b5f7b9.tar.gz CMake-745671441d3bcecac171334da350e92ab8b5f7b9.tar.bz2 | |
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.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_endian.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_endian.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h index 067312d..58abee6 100644 --- a/Utilities/cmlibarchive/libarchive/archive_endian.h +++ b/Utilities/cmlibarchive/libarchive/archive_endian.h @@ -48,7 +48,7 @@ */ #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) || defined(__SUNPRO_C) #define inline -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) || defined(__osf__) #define inline __inline #endif |