diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-11 17:32:20 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-11 17:32:27 +0200 |
| commit | d17ce77fc178f16cfe63e9de6f5bcc445fabe1cb (patch) | |
| tree | a0e62968ec85a99ab368f14a374d06db7778d01e | |
| parent | 6b5b7cbfb4cafaf0b616ba5cf72024b9d01a2fac (diff) | |
| parent | 565e56977235974c0dd3acfe2023beb84974297c (diff) | |
| download | bitcoin-d17ce77fc178f16cfe63e9de6f5bcc445fabe1cb.tar.xz | |
Merge pull request #4664
565e569 libc-compat: add new symbol that's now needed (Cory Fields)
8021cf8 build: fix FDELT_TYPE configure check (Cory Fields)
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/compat/glibcxx_compat.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0b2a429e02..ffd05ae4f8 100644 --- a/configure.ac +++ b/configure.ac @@ -332,7 +332,10 @@ if test x$use_glibc_compat != xno; then #__fdelt_chk's params and return type have changed from long unsigned int to long int. # See which one is present here. AC_MSG_CHECKING(__fdelt_chk type) - AC_TRY_COMPILE([#define __USE_FORTIFY_LEVEL 2 + AC_TRY_COMPILE([#ifdef _FORTIFY_SOURCE + #undef _FORTIFY_SOURCE + #endif + #define _FORTIFY_SOURCE 2 #include <sys/select.h> extern "C" long unsigned int __fdelt_warn(long unsigned int);],[], [ fdelt_type="long unsigned int"], diff --git a/src/compat/glibcxx_compat.cpp b/src/compat/glibcxx_compat.cpp index 417166aeda..cbe059735b 100644 --- a/src/compat/glibcxx_compat.cpp +++ b/src/compat/glibcxx_compat.cpp @@ -64,6 +64,8 @@ template istream& istream::_M_extract(unsigned short&); out_of_range::~out_of_range() _GLIBCXX_USE_NOEXCEPT { } +length_error::~length_error() _GLIBCXX_USE_NOEXCEPT { } + // Used with permission. // See: https://github.com/madlib/madlib/commit/c3db418c0d34d6813608f2137fef1012ce03043d |