From: Nick Mathewson Date: Sun, 16 Feb 2014 17:51:35 +0000 (-0500) Subject: mingw fix: Rename a variable in the unit tests X-Git-Tag: tor-0.2.5.3-alpha~69 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1deb01e5f1a666486690f9e511b3a0af66ed683;p=thirdparty%2Ftor.git mingw fix: Rename a variable in the unit tests Apparently, MS C is #defining "IN" on us, so we can't name a variable IN. Delightful! --- diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index b1252a11d3..00b8693b18 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1189,16 +1189,16 @@ test_crypto_siphash(void *arg) const struct sipkey K = { U64_LITERAL(0x0706050403020100), U64_LITERAL(0x0f0e0d0c0b0a0908) }; - uint8_t IN[64]; + uint8_t input[64]; int i, j; (void)arg; for (i = 0; i < 64; ++i) - IN[i] = i; + input[i] = i; for (i = 0; i < 64; ++i) { - uint64_t r = siphash24(IN, i, &K); + uint64_t r = siphash24(input, i, &K); for (j = 0; j < 8; ++j) { tt_int_op( (r >> (j*8)) & 0xff, ==, VECTORS[i][j]); }