From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 Aug 2014 00:12:57 +0000 (-0400)
Subject: Fix linux compilation of ed25519_ref10
X-Git-Tag: tor-0.2.6.1-alpha~87^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d3b33e1ede15c787d0c2d1f8823cdad1a196008;p=thirdparty%2Ftor.git

Fix linux compilation of ed25519_ref10

Our integer-definition headers apparently suck in a definition for
select(2), which interferes with the select() in ge_scalarmult_base.c
---

diff --git a/src/ext/ed25519/ref10/ge_scalarmult_base.c b/src/ext/ed25519/ref10/ge_scalarmult_base.c
index a55c3c4611..ad7aae40d9 100644
--- a/src/ext/ed25519/ref10/ge_scalarmult_base.c
+++ b/src/ext/ed25519/ref10/ge_scalarmult_base.c
@@ -1,6 +1,10 @@
 #include "ge.h"
 #include "crypto_uint32.h"
 
+/* Rename this so as not to interfere with select() which torint.h apparently
+ * grabs. :p */
+#define select ed25519_ref10_select
+
 static unsigned char equal(signed char b,signed char c)
 {
   unsigned char ub = b;