upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- #492: Fix endianness detection, revert to older lookup3.c detection

Browse source 
and put new detect lines after previous tests, to avoid regressions
  but allow new detections to succeed.


git-svn-id: file:///svn/unbound/trunk@2872 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2013-03-25 09:35:27 +00:00
parent 3f2dcf1c0b
commit 450304d3a1
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/Changelog
View file

@ -1,3 +1,8 @@
25 March 2013: Wouter
- #492: Fix endianness detection, revert to older lookup3.c detection
and put new detect lines after previous tests, to avoid regressions
but allow new detections to succeed.
22 March 2013: Wouter 22 March 2013: Wouter
- Fix resolve of names that use a mix of public and private addresses. - Fix resolve of names that use a mix of public and private addresses.
- iana portlist update. - iana portlist update.

16
util/storage/lookup3.c
View file

@ -75,22 +75,24 @@ hash_set_raninit(uint32_t v)
*/ */
#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \ #if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
__BYTE_ORDER == __LITTLE_ENDIAN) || \ __BYTE_ORDER == __LITTLE_ENDIAN) || \
(defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && \
_BYTE_ORDER == _LITTLE_ENDIAN) || \
(defined(i386) || defined(__i386__) || defined(__i486__) || \ (defined(i386) || defined(__i386__) || defined(__i486__) || \
defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL)) defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
# define HASH_LITTLE_ENDIAN 1 # define HASH_LITTLE_ENDIAN 1
# define HASH_BIG_ENDIAN 0 # define HASH_BIG_ENDIAN 0
#elif (!defined(_BYTE_ORDER) && !defined(__BYTE_ORDER) && defined(_BIG_ENDIAN))
# define HASH_LITTLE_ENDIAN 0
# define HASH_BIG_ENDIAN 1
#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \ #elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
__BYTE_ORDER == __BIG_ENDIAN) || \ __BYTE_ORDER == __BIG_ENDIAN) || \
(defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && \
_BYTE_ORDER == _BIG_ENDIAN) || \
(defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel)) (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
# define HASH_LITTLE_ENDIAN 0 # define HASH_LITTLE_ENDIAN 0
# define HASH_BIG_ENDIAN 1 # define HASH_BIG_ENDIAN 1
/* test later because it fails when they are defined to empty strings */
#elif (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && \
_BYTE_ORDER == _BIG_ENDIAN) || \
# define HASH_LITTLE_ENDIAN 0
# define HASH_BIG_ENDIAN 1
#elif (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && \
_BYTE_ORDER == _LITTLE_ENDIAN) || \
# define HASH_LITTLE_ENDIAN 1
# define HASH_BIG_ENDIAN 0
#else #else
# define HASH_LITTLE_ENDIAN 0 # define HASH_LITTLE_ENDIAN 0
# define HASH_BIG_ENDIAN 0 # define HASH_BIG_ENDIAN 0