[llvm-branch-commits] [llvm-branch] r214749 - Merging r213966:

[Bill Wendling]

Author: void
Date: Mon Aug  4 13:36:56 2014
New Revision: 214749

URL: http://llvm.org/viewvc/llvm-project?rev=214749&view=rev
Log:
Merging r213966:
------------------------------------------------------------------------
r213966 | brad | 2014-07-25 12:28:44 -0700 (Fri, 25 Jul 2014) | 4 lines

Fix arc4random detection.

Patch by Pascal Stumpf.

------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/include/llvm/Config/config.h.cmake

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  4 13:36:56 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798,213815,213847,213880,213883-213884,213894-213896,213899,213915,213999,214129,214180,214287,214331,214423,214429,214519
+/llvm/trunk:155241,213653,213665,213726,213749,213773,213793,213798,213815,213847,213880,213883-213884,213894-213896,213899,213915,213966,213999,214129,214180,214287,214331,214423,214429,214519

Modified: llvm/branches/release_35/include/llvm/Config/config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/include/llvm/Config/config.h.cmake?rev=214749&r1=214748&r2=214749&view=diff
==============================================================================
--- llvm/branches/release_35/include/llvm/Config/config.h.cmake (original)
+++ llvm/branches/release_35/include/llvm/Config/config.h.cmake Mon Aug  4 13:36:56 2014
@@ -25,7 +25,7 @@
 #cmakedefine ENABLE_TIMESTAMPS ${ENABLE_TIMESTAMPS}
 
 /* Define to 1 if you have the `arc4random' function. */
-#cmakedefine HAVE_ARC4RANDOM
+#cmakedefine HAVE_DECL_ARC4RANDOM ${HAVE_DECL_ARC4RANDOM}
 
 /* Define to 1 if you have the `backtrace' function. */
 #cmakedefine HAVE_BACKTRACE ${HAVE_BACKTRACE}