quirks\windows\windows-quirks.h -> quirks\quirks.h

9 years ago · 4724440492
14 changed files with 21 additions and 39 deletions
--- a/builds/msvc/vs2010/test/test.vcxproj
+++ b/builds/msvc/vs2010/test/test.vcxproj
@ -226,7 +226,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
-    <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
+    <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
--- a/builds/msvc/vs2010/test/test.vcxproj.filters
+++ b/builds/msvc/vs2010/test/test.vcxproj.filters
@ -165,7 +165,7 @@
    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
      <Filter>include</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h">
+    <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
      <Filter>include</Filter>
    </ClInclude>
  </ItemGroup>
@ -177,4 +177,4 @@
      <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
-</Project>
+</Project>
--- a/builds/msvc/vs2012/test/test.vcxproj
+++ b/builds/msvc/vs2012/test/test.vcxproj
@ -226,7 +226,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
-    <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
+    <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
--- a/builds/msvc/vs2012/test/test.vcxproj.filters
+++ b/builds/msvc/vs2012/test/test.vcxproj.filters
@ -165,7 +165,7 @@
    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
      <Filter>include</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h">
+    <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
      <Filter>include</Filter>
    </ClInclude>
  </ItemGroup>
@ -177,4 +177,4 @@
      <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
-</Project>
+</Project>
--- a/builds/msvc/vs2013/test/test.vcxproj
+++ b/builds/msvc/vs2013/test/test.vcxproj
@ -226,7 +226,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\test\default\cmptest.h" />
-    <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
+    <ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
--- a/builds/msvc/vs2013/test/test.vcxproj.filters
+++ b/builds/msvc/vs2013/test/test.vcxproj.filters
@ -165,7 +165,7 @@
    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
      <Filter>include</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h">
+    <ClInclude Include="..\..\..\..\test\quirks\quirks.h">
      <Filter>include</Filter>
    </ClInclude>
  </ItemGroup>
@ -177,4 +177,4 @@
      <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
-</Project>
+</Project>
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -2,4 +2,4 @@ SUBDIRS = \
 	default

 EXTRA_DIST = \
-	quirks/windows/windows-quirks.h
+	quirks/quirks.h
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/test/quirks/windows/windows-quirks.h
+++ b/test/quirks/windows/windows-quirks.h
@ -1,18 +0,0 @@
-
-#include <stdlib.h>
-
-#ifdef _WIN32
-
-static void
-srandom(unsigned seed)
-{
-    srand(seed);
-}
-
-static long
-random(void)
-{
-    return (long) rand();
-}
-
-#endif