Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Nov 2018 18:24:11 +0000 (UTC)
From:      Mariusz Zaborski <oshogbo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340133 - head/contrib/expat/lib
Message-ID:  <201811041824.wA4IOBH6078585@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oshogbo
Date: Sun Nov  4 18:24:11 2018
New Revision: 340133
URL: https://svnweb.freebsd.org/changeset/base/340133

Log:
  Un-break build libexpact.
  
  The writeRandomBytes_arc4random is not used if the arc4random_buf
  is available. This caused compiler to throw warnings which are treated as
  an error in libexpact.
  
  Approved by:	vangyzen

Modified:
  head/contrib/expat/lib/xmlparse.c

Modified: head/contrib/expat/lib/xmlparse.c
==============================================================================
--- head/contrib/expat/lib/xmlparse.c	Sun Nov  4 17:56:16 2018	(r340132)
+++ head/contrib/expat/lib/xmlparse.c	Sun Nov  4 18:24:11 2018	(r340133)
@@ -747,7 +747,7 @@ writeRandomBytes_dev_urandom(void * target, size_t cou
 #endif  /* ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM) */
 
 
-#if defined(HAVE_ARC4RANDOM)
+#if defined(HAVE_ARC4RANDOM) && ! defined(HAVE_ARC4RANDOM_BUF)
 
 static void
 writeRandomBytes_arc4random(void * target, size_t count) {
@@ -765,7 +765,7 @@ writeRandomBytes_arc4random(void * target, size_t coun
   }
 }
 
-#endif  /* defined(HAVE_ARC4RANDOM) */
+#endif  /* defined(HAVE_ARC4RANDOM) && ! defined(HAVE_ARC4RANDOM_BUF) */
 
 
 #ifdef _WIN32



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811041824.wA4IOBH6078585>