Browse Source
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)
pull/145/head
Wladimir J. van der Laan
10 years ago
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with
6 additions and
1 deletions
-
configure.ac
-
src/compat/glibcxx_compat.cpp
|
|
|
@ -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"], |
|
|
|
|
|
|
|
@ -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
|
|
|
|
|
|
|
|
|
