Merge branch 'expat-entropy-fix'

.travis.yml

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

src/expat/lib/xmlparse.c

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