[tor-commits] [tor/master] Fix linux compilation of ed25519_ref10

[nickm@xxxxxxxxxxxxxx]

commit 1d3b33e1ede15c787d0c2d1f8823cdad1a196008
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 27 20:12:57 2014 -0400

    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
---
 src/ext/ed25519/ref10/ge_scalarmult_base.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ext/ed25519/ref10/ge_scalarmult_base.c b/src/ext/ed25519/ref10/ge_scalarmult_base.c
index a55c3c4..ad7aae4 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;



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits