aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-27 20:12:57 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-25 15:08:31 -0400
commit1d3b33e1ede15c787d0c2d1f8823cdad1a196008 (patch)
treea272b7d69da46f877e633b303bbbc7bc64e23a6e /src/ext
parent25b1a32ef85c0b1d57a326991df002c86097a142 (diff)
downloadtor-1d3b33e1ede15c787d0c2d1f8823cdad1a196008.tar.gz
tor-1d3b33e1ede15c787d0c2d1f8823cdad1a196008.zip
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
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/ed25519/ref10/ge_scalarmult_base.c4
1 files changed, 4 insertions, 0 deletions
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;