From 2037ec371c65a4c10223256fdac2f0673c6f530f Mon Sep 17 00:00:00 2001
From: Simon Goldschmidt <goldsimon@gmx.de>
Date: Wed, 30 Jan 2019 14:53:41 +0100
Subject: [PATCH] test: fix compiling unit test on win32

---
 contrib/ports/win32/include/arch/cc.h | 6 ++----
 contrib/ports/win32/msvc/lwIP.vcxproj | 4 ++--
 contrib/ports/win32/sys_arch.c        | 2 +-
 test/unit/lwip_unittests.c            | 7 +++++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/contrib/ports/win32/include/arch/cc.h b/contrib/ports/win32/include/arch/cc.h
index 3ee051da..37ed83d6 100644
--- a/contrib/ports/win32/include/arch/cc.h
+++ b/contrib/ports/win32/include/arch/cc.h
@@ -102,10 +102,8 @@ void lwip_win32_platform_diag(const char *format, ...);
 #define LWIP_PLATFORM_DIAG(x) lwip_win32_platform_diag x
 #endif
 
-#ifndef LWIP_NORAND
-extern unsigned int sys_win_rand(void);
-#define LWIP_RAND() (sys_win_rand())
-#endif
+extern unsigned int lwip_port_rand(void);
+#define LWIP_RAND() (lwip_port_rand())
 
 #define PPP_INCLUDE_SETTINGS_HEADER
 
diff --git a/contrib/ports/win32/msvc/lwIP.vcxproj b/contrib/ports/win32/msvc/lwIP.vcxproj
index b5fa6136..00045921 100644
--- a/contrib/ports/win32/msvc/lwIP.vcxproj
+++ b/contrib/ports/win32/msvc/lwIP.vcxproj
@@ -125,7 +125,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LWIP_NORAND;_LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -150,7 +150,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>LWIP_NORAND;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
diff --git a/contrib/ports/win32/sys_arch.c b/contrib/ports/win32/sys_arch.c
index 9643ff19..84c1bcaf 100644
--- a/contrib/ports/win32/sys_arch.c
+++ b/contrib/ports/win32/sys_arch.c
@@ -79,7 +79,7 @@ static DWORD netconn_sem_tls_index;
 static HCRYPTPROV hcrypt;
 
 u32_t
-sys_win_rand(void)
+lwip_port_rand(void)
 {
   u32_t ret;
   if (CryptGenRandom(hcrypt, sizeof(ret), (BYTE*)&ret)) {
diff --git a/test/unit/lwip_unittests.c b/test/unit/lwip_unittests.c
index 497a44b2..c93f05e2 100644
--- a/test/unit/lwip_unittests.c
+++ b/test/unit/lwip_unittests.c
@@ -21,6 +21,13 @@
 #include "lwip/tcpip.h"
 #endif
 
+/* This function is used for LWIP_RAND by some ports... */
+unsigned int
+lwip_port_rand(void)
+{
+  return rand();
+}
+
 Suite* create_suite(const char* name, testfunc *tests, size_t num_tests, SFun setup, SFun teardown)
 {
   size_t i;