mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: fix compiling unit test on win32

Browse Source
This commit is contained in:
Simon Goldschmidt 2019-01-30 14:53:41 +01:00
parent 2cc420e434
commit 2037ec371c
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/ports/win32/include/arch/cc.h
View File

@ -102,10 +102,8 @@ void lwip_win32_platform_diag(const char *format, ...);
#define LWIP_PLATFORM_DIAG(x) lwip_win32_platform_diag x #define LWIP_PLATFORM_DIAG(x) lwip_win32_platform_diag x
#endif #endif
#ifndef LWIP_NORAND extern unsigned int lwip_port_rand(void);
extern unsigned int sys_win_rand(void); #define LWIP_RAND() (lwip_port_rand())
#define LWIP_RAND() (sys_win_rand())
#endif
#define PPP_INCLUDE_SETTINGS_HEADER #define PPP_INCLUDE_SETTINGS_HEADER

4
contrib/ports/win32/msvc/lwIP.vcxproj
View File

@ -125,7 +125,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
@ -150,7 +150,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>

2
contrib/ports/win32/sys_arch.c
View File

@ -79,7 +79,7 @@ static DWORD netconn_sem_tls_index;
static HCRYPTPROV hcrypt; static HCRYPTPROV hcrypt;
u32_t u32_t
sys_win_rand(void) lwip_port_rand(void)
{ {
u32_t ret; u32_t ret;
if (CryptGenRandom(hcrypt, sizeof(ret), (BYTE*)&ret)) { if (CryptGenRandom(hcrypt, sizeof(ret), (BYTE*)&ret)) {

7
test/unit/lwip_unittests.c
View File

@ -21,6 +21,13 @@
#include "lwip/tcpip.h" #include "lwip/tcpip.h"
#endif #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) Suite* create_suite(const char* name, testfunc *tests, size_t num_tests, SFun setup, SFun teardown)
{ {
size_t i; size_t i;