diff options
| author | Kenneth Heafield <kheafiel@cluster10.lti.ece.cmu.local> | 2011-03-21 22:00:29 -0400 |
|---|---|---|
| committer | Kenneth Heafield <kheafiel@cluster10.lti.ece.cmu.local> | 2011-03-21 22:00:29 -0400 |
| commit | 1028f393ea30d69f7a44334ed3585c520a4b84d1 (patch) | |
| tree | 2273793f6665f0169b66fc6d13dcdb2bb4050ff5 | |
| parent | 7acae787a81b7fe6b8f45191c3a8a0f5fd178593 (diff) | |
compiler warnings
| -rw-r--r-- | klm/util/bit_packing.hh | 7 | ||||
| -rw-r--r-- | klm/util/have.hh | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/klm/util/bit_packing.hh b/klm/util/bit_packing.hh index 70cfc2d2..5c71c792 100644 --- a/klm/util/bit_packing.hh +++ b/klm/util/bit_packing.hh @@ -28,16 +28,19 @@ namespace util { * but it may be called multiple times when that's inconvenient. */ -inline uint8_t BitPackShift(uint8_t bit, uint8_t length) { + // Fun fact: __BYTE_ORDER is wrong on Solaris Sparc, but the version without __ is correct. #if BYTE_ORDER == LITTLE_ENDIAN +inline uint8_t BitPackShift(uint8_t bit, uint8_t /*length*/) { return bit; +} #elif BYTE_ORDER == BIG_ENDIAN +inline uint8_t BitPackShift(uint8_t bit, uint8_t length) { return 64 - length - bit; +} #else #error "Bit packing code isn't written for your byte order." #endif -} /* Pack integers up to 57 bits using their least significant digits. * The length is specified using mask: diff --git a/klm/util/have.hh b/klm/util/have.hh index 7cf62008..f2f0cf90 100644 --- a/klm/util/have.hh +++ b/klm/util/have.hh @@ -2,8 +2,14 @@ #ifndef UTIL_HAVE__ #define UTIL_HAVE__ +#ifndef HAVE_ZLIB #define HAVE_ZLIB +#endif + // #define HAVE_ICU + +#ifndef HAVE_BOOST #define HAVE_BOOST +#endif #endif // UTIL_HAVE__ |