Merge branch 'master' into return_for_test_failed

makefile

@@ -1,6 +1,6 @@
 CC=gcc
 CFLAGS=-Wall --std=c99 
-SRC=siphash.c halfsiphash.c test.c
+SRC=siphash.c halfsiphash.c test.c testmain.c
 BIN=test debug vectors
 
 ifneq ($(cROUNDS),)

test.c

@@ -44,7 +44,7 @@ const char *labels[4] = {
 
 size_t lengths[4] = {8, 16, 4, 8};
 
-int main() {
+int siphash_test() {
     uint8_t in[64], out[16], k[16];
     int i;
     bool any_failed;

testmain.c

@@ -0,0 +1,5 @@
+int siphash_test();
+
+int main(void) {
+    return siphash_test();
+}