Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'expat-entropy-fix'

Browse Source
This commit is contained in:
Vadim Zeitlin
2017-11-10 18:15:36 +01:00
parent e35aff4684 fc8b7e4e61
commit 6022a51881
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -17,7 +17,7 @@ matrix:
env: wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" env: wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11"
- dist: trusty - dist: trusty
compiler: clang compiler: clang
env: wxCONFIGURE_FLAGS="--disable-shared" env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs"
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
compiler: clang compiler: clang

2
src/expat/lib/xmlparse.c
View File

@@ -54,7 +54,7 @@
#if !defined(HAVE_GETRANDOM) && !defined(HAVE_SYSCALL_GETRANDOM) \ #if !defined(HAVE_GETRANDOM) && !defined(HAVE_SYSCALL_GETRANDOM) \
&& !defined(HAVE_ARC4RANDOM_BUF) && !defined(_WIN32) \ && !defined(HAVE_ARC4RANDOM_BUF) && !defined(_WIN32) \
&& !defined(XML_POOR_ENTROPY) && !defined(XML_POOR_ENTROPY) && !defined(HAVE_EXPAT_CONFIG_H)
# error \ # error \
You do not have support for any sources of high quality entropy \ You do not have support for any sources of high quality entropy \
enabled. For end user security, that is probably not what you want. \ enabled. For end user security, that is probably not what you want. \