aboutsummaryrefslogtreecommitdiff
path: root/patches/arc4random.c.patch
blob: 9f9c47624b1ed309eb18db40e80e009f106b5071 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
--- crypto/compat/arc4random.c.orig	2015-07-20 07:41:17.000000000 -0600
+++ crypto/compat/arc4random.c	2015-07-20 07:41:58.000000000 -0600
@@ -36,8 +36,11 @@
 #define KEYSTREAM_ONLY
 #include "chacha_private.h"
 
+#ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
-#ifdef __GNUC__
+#endif
+
+#if defined(__GNUC__) || defined(_MSC_VER)
 #define inline __inline
 #else				/* !__GNUC__ */
 #define inline