From 47244404927b9ca3c8d2ed47ee49d0668c4d6c56 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 23 Jan 2015 10:35:20 +0100 Subject: [PATCH] quirks\windows\windows-quirks.h -> quirks\quirks.h --- builds/msvc/vs2010/test/test.vcxproj | 4 ++-- builds/msvc/vs2010/test/test.vcxproj.filters | 4 ++-- builds/msvc/vs2012/test/test.vcxproj | 4 ++-- builds/msvc/vs2012/test/test.vcxproj.filters | 4 ++-- builds/msvc/vs2013/test/test.vcxproj | 4 ++-- builds/msvc/vs2013/test/test.vcxproj.filters | 4 ++-- test/Makefile.am | 2 +- test/default/Makefile.am | 6 +++--- test/default/auth5.c | 2 +- test/default/auth7.c | 2 +- test/default/box8.c | 2 +- test/default/onetimeauth7.c | 2 +- test/default/secretbox8.c | 2 +- test/quirks/windows/windows-quirks.h | 18 ------------------ 14 files changed, 21 insertions(+), 39 deletions(-) delete mode 100644 test/quirks/windows/windows-quirks.h diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj index 953995fe..c31f2621 100644 --- a/builds/msvc/vs2010/test/test.vcxproj +++ b/builds/msvc/vs2010/test/test.vcxproj @@ -226,7 +226,7 @@ - + - \ No newline at end of file + diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters index 4643541b..edf0138a 100644 --- a/builds/msvc/vs2010/test/test.vcxproj.filters +++ b/builds/msvc/vs2010/test/test.vcxproj.filters @@ -165,7 +165,7 @@ include - + include @@ -177,4 +177,4 @@ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea} - \ No newline at end of file + diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj index 6ae0a575..da8adafc 100644 --- a/builds/msvc/vs2012/test/test.vcxproj +++ b/builds/msvc/vs2012/test/test.vcxproj @@ -226,7 +226,7 @@ - + - \ No newline at end of file + diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters index 4643541b..edf0138a 100644 --- a/builds/msvc/vs2012/test/test.vcxproj.filters +++ b/builds/msvc/vs2012/test/test.vcxproj.filters @@ -165,7 +165,7 @@ include - + include @@ -177,4 +177,4 @@ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea} - \ No newline at end of file + diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj index 70315965..9b1bec9a 100644 --- a/builds/msvc/vs2013/test/test.vcxproj +++ b/builds/msvc/vs2013/test/test.vcxproj @@ -226,7 +226,7 @@ - + - \ No newline at end of file + diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters index 4643541b..edf0138a 100644 --- a/builds/msvc/vs2013/test/test.vcxproj.filters +++ b/builds/msvc/vs2013/test/test.vcxproj.filters @@ -165,7 +165,7 @@ include - + include @@ -177,4 +177,4 @@ {5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea} - \ No newline at end of file + diff --git a/test/Makefile.am b/test/Makefile.am index 346d2692..f9894bb8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,4 +2,4 @@ SUBDIRS = \ default EXTRA_DIST = \ - quirks/windows/windows-quirks.h + quirks/quirks.h diff --git a/test/default/Makefile.am b/test/default/Makefile.am index 6972848f..d665ba02 100644 --- a/test/default/Makefile.am +++ b/test/default/Makefile.am @@ -211,13 +211,13 @@ auth2_LDADD = $(TESTS_LDADD) auth3_SOURCE = cmptest.h auth3.c auth3_LDADD = $(TESTS_LDADD) -auth5_SOURCE = cmptest.h auth5.c windows/windows-quirks.h +auth5_SOURCE = cmptest.h auth5.c quirks.h auth5_LDADD = $(TESTS_LDADD) -auth6_SOURCE = cmptest.h auth6.c windows/windows-quirks.h +auth6_SOURCE = cmptest.h auth6.c quirks.h auth6_LDADD = $(TESTS_LDADD) -auth7_SOURCE = cmptest.h auth7.c windows/windows-quirks.h +auth7_SOURCE = cmptest.h auth7.c quirks.h auth7_LDADD = $(TESTS_LDADD) box_SOURCE = cmptest.h box.c diff --git a/test/default/auth5.c b/test/default/auth5.c index 7557bd70..bee53469 100644 --- a/test/default/auth5.c +++ b/test/default/auth5.c @@ -1,5 +1,5 @@ -#include "windows/windows-quirks.h" +#include "quirks.h" #define TEST_NAME "auth5" #include "cmptest.h" diff --git a/test/default/auth7.c b/test/default/auth7.c index 9a1e90ce..e431e43f 100644 --- a/test/default/auth7.c +++ b/test/default/auth7.c @@ -1,5 +1,5 @@ -#include "windows/windows-quirks.h" +#include "quirks.h" #define TEST_NAME "auth7" #include "cmptest.h" diff --git a/test/default/box8.c b/test/default/box8.c index fbfcff83..af6fb11f 100644 --- a/test/default/box8.c +++ b/test/default/box8.c @@ -1,5 +1,5 @@ -#include "windows/windows-quirks.h" +#include "quirks.h" #define TEST_NAME "box8" #include "cmptest.h" diff --git a/test/default/onetimeauth7.c b/test/default/onetimeauth7.c index 18d1186a..8d9a283b 100644 --- a/test/default/onetimeauth7.c +++ b/test/default/onetimeauth7.c @@ -1,5 +1,5 @@ -#include "windows/windows-quirks.h" +#include "quirks.h" #define TEST_NAME "onetimeauth7" #include "cmptest.h" diff --git a/test/default/secretbox8.c b/test/default/secretbox8.c index 7fbb8116..21ace132 100644 --- a/test/default/secretbox8.c +++ b/test/default/secretbox8.c @@ -1,5 +1,5 @@ -#include "windows/windows-quirks.h" +#include "quirks.h" #define TEST_NAME "secretbox8" #include "cmptest.h" diff --git a/test/quirks/windows/windows-quirks.h b/test/quirks/windows/windows-quirks.h deleted file mode 100644 index 11d82bf9..00000000 --- a/test/quirks/windows/windows-quirks.h +++ /dev/null @@ -1,18 +0,0 @@ - -#include - -#ifdef _WIN32 - -static void -srandom(unsigned seed) -{ - srand(seed); -} - -static long -random(void) -{ - return (long) rand(); -} - -#endif