diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
| commit | eefcd6d0b271642d470cd55bc47d1579d943938e (patch) | |
| tree | 48f9e4db455879025adb9317b740bfa4b72c2d66 /src/import.cc | |
| parent | f70578f362c8c2c78036c9de846c20802ac7aa81 (diff) | |
| parent | beff2b1f4811b7f9d2b58bfc6a469a363bc9bfd0 (diff) | |
Merge branch 'master' into epec-kernel
Conflicts:
src/PolySetCGALEvaluator.cc
Diffstat (limited to 'src/import.cc')
| -rw-r--r-- | src/import.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/import.cc b/src/import.cc index 8980448..32d4fed 100644 --- a/src/import.cc +++ b/src/import.cc @@ -132,7 +132,9 @@ union stl_facet { void uint32_byte_swap( uint32_t &x ) { -#if defined(__GNUC__) || defined(__clang__) +#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 + x = __builtin_bswap32( x ); +#elif defined(__clang__) x = __builtin_bswap32( x ); #elif defined(_MSC_VER) x = _byteswap_ulong( x ); |