mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-01 04:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some compile problems with mingw

Browse Source
This commit is contained in:
Simon Goldschmidt 2022-01-12 22:16:00 +01:00
parent a55679224f
commit 215dec653b
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/examples/sntp/sntp_example.c
View File

@ -1,5 +1,5 @@
/* /*
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met: * are permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
@ -8,21 +8,21 @@
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products * 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE. * OF SUCH DAMAGE.
* *
* This file is part of the lwIP TCP/IP stack. * This file is part of the lwIP TCP/IP stack.
* *
* Author: Dirk Ziegelmeier <dziegel@gmx.de> * Author: Dirk Ziegelmeier <dziegel@gmx.de>
* *
*/ */
@ -41,12 +41,12 @@ sntp_set_system_time(u32_t sec)
struct tm current_time_val; struct tm current_time_val;
time_t current_time = (time_t)sec; time_t current_time = (time_t)sec;
#ifdef _MSC_VER #if defined(_WIN32) || defined(WIN32)
localtime_s(&current_time_val, &current_time); localtime_s(&current_time_val, &current_time);
#else #else
localtime_r(&current_time, &current_time_val); localtime_r(&current_time, &current_time_val);
#endif #endif
strftime(buf, sizeof(buf), "%d.%m.%Y %H:%M:%S", &current_time_val); strftime(buf, sizeof(buf), "%d.%m.%Y %H:%M:%S", &current_time_val);
LWIP_PLATFORM_DIAG(("SNTP time: %s\n", buf)); LWIP_PLATFORM_DIAG(("SNTP time: %s\n", buf));
} }

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

@ -50,6 +50,11 @@
#define LWIP_PROVIDE_ERRNO /* provide errno for non-MSVC */ #define LWIP_PROVIDE_ERRNO /* provide errno for non-MSVC */
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#ifdef __GNUC__
#define LWIP_TIMEVAL_PRIVATE 0
#include <sys/time.h>
#endif
/* Define platform endianness (might already be defined) */ /* Define platform endianness (might already be defined) */
#ifndef BYTE_ORDER #ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN #define BYTE_ORDER LITTLE_ENDIAN

1
contrib/ports/win32/pcapif_helper.c
View File

@ -102,7 +102,6 @@ pcapifh_alloc_readonly_copy(void *data, size_t len)
lwip_win32_platform_diag("VirtualProtect failed: %d\n", GetLastError()); lwip_win32_platform_diag("VirtualProtect failed: %d\n", GetLastError());
while(1); while(1);
} }
printf("pcapifh_alloc_readonly_copy(%d): 0x%08x\n", len, ret);
return ret; return ret;
} }