diff options
| author | dougb <dougb@FreeBSD.org> | 2010-10-31 04:45:25 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-10-31 04:45:25 +0000 |
| commit | 58320b36c14936885a4e36fb961ca74775a9664c (patch) | |
| tree | 84a6db13621673c13938a9f2bea8ff7ab17042f1 | |
| parent | 8d191fa3637a9e5f1ebd79ce00369cab44896f79 (diff) | |
| download | FreeBSD-src-58320b36c14936885a4e36fb961ca74775a9664c.zip FreeBSD-src-58320b36c14936885a4e36fb961ca74775a9664c.tar.gz | |
Prep for the 9.6-ESV-R2 update
| -rw-r--r-- | lib/bind/config.h | 20 | ||||
| -rw-r--r-- | lib/bind/isc/isc/platform.h | 7 |
2 files changed, 22 insertions, 5 deletions
diff --git a/lib/bind/config.h b/lib/bind/config.h index 3038b5b..5df58ae 100644 --- a/lib/bind/config.h +++ b/lib/bind/config.h @@ -147,6 +147,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define if threads need PTHREAD_SCOPE_SYSTEM */ /* #undef NEED_PTHREAD_SCOPE_SYSTEM */ +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + /* Define if recvmsg() does not meet all of the BSD socket API specifications. */ /* #undef BROKEN_RECVMSG */ @@ -306,6 +309,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ #define PACKAGE_VERSION "" @@ -327,11 +333,15 @@ int sigwait(const unsigned int *set, int *sig); /* #undef WITH_IDN */ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -#elif ! defined __LITTLE_ENDIAN__ -/* # undef WORDS_BIGENDIAN */ + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif #endif /* Define to empty if `const' does not conform to ANSI C. */ diff --git a/lib/bind/isc/isc/platform.h b/lib/bind/isc/isc/platform.h index 197a2bc..7cb7f34 100644 --- a/lib/bind/isc/isc/platform.h +++ b/lib/bind/isc/isc/platform.h @@ -252,7 +252,14 @@ * If the "xaddq" operation (64bit xadd) is available on this architecture, * ISC_PLATFORM_HAVEXADDQ will be defined. */ +/* + * FreeBSD local modification, preserve this over upgrades + */ +#ifdef __amd64__ +#define ISC_PLATFORM_HAVEXADDQ 1 +#else #undef ISC_PLATFORM_HAVEXADDQ +#endif /* * If the "atomic swap" operation is available on this architecture, |
