GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 7a311fa54a into merged_master (Bitcoin PR #17738)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-14 16:52:11 +00:00
commit e0be1ae444
2 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build_msvc/bitcoin_config.h
View file

@ -222,9 +222,6 @@
/* Define to 1 if you have the `rpcrt4' library (-lrpcrt4). */
#define HAVE_LIBRPCRT4 1
/* Define to 1 if you have the `rt' library (-lrt). */
/* #undef HAVE_LIBRT */
/* Define to 1 if you have the `shell32' library (-lshell32). */
#define HAVE_LIBSHELL32 1

4
configure.ac
View file

@ -720,10 +720,6 @@ AX_GCC_FUNC_ATTRIBUTE([dllimport])
if test x$use_glibc_compat != xno; then
dnl glibc absorbed clock_gettime in 2.17. librt (its previous location) is safe to link
dnl in anyway for back-compat.
AC_CHECK_LIB([rt],[clock_gettime],, AC_MSG_ERROR(librt missing))
dnl __fdelt_chk's params and return type have changed from long unsigned int to long int.
dnl See which one is present here.
AC_MSG_CHECKING(__fdelt_chk type)