diff options
| author | kientzle <kientzle@FreeBSD.org> | 2008-12-06 06:12:24 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2008-12-06 06:12:24 +0000 |
| commit | cc9ad7c8d58f40d6baaeb980e55105fe6b9624a9 (patch) | |
| tree | e0ec557871366e51817c46077fbc1444550592d6 /lib/libarchive | |
| parent | df16f9219192875a851cc0a1df79377afb2e3aec (diff) | |
| download | FreeBSD-src-cc9ad7c8d58f40d6baaeb980e55105fe6b9624a9.zip FreeBSD-src-cc9ad7c8d58f40d6baaeb980e55105fe6b9624a9.tar.gz | |
A couple of portability fixes from Joerg Sonnenberger
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/archive_endian.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libarchive/archive_endian.h b/lib/libarchive/archive_endian.h index 7613178..613395b 100644 --- a/lib/libarchive/archive_endian.h +++ b/lib/libarchive/archive_endian.h @@ -35,14 +35,14 @@ #define ARCHIVE_ENDIAN_H_INCLUDED -/* Watcom C++ doesn't support 'inline' in C code. (For any version?) */ -#if defined( __WATCOMC__ ) - #define inline -#endif - -/* Visual C++ 6.0 doesn't support 'inline' in C code. (Does VC7? VC8?) */ -#if defined(_MSC_VER) - #define inline +/* + * Disabling inline keyword for compilers known to choke on it: + * - Watcom C++ in C code. (For any version?) + * - SGI MIPSpro + * - Microsoft Visual C++ 6.0 (supposedly newer versions too) + */ +#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER) +#define inline #endif /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ |
