From 215dec653b3d8bbd514e9ce30392bd807549ebbe Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Wed, 12 Jan 2022 22:16:00 +0100 Subject: [PATCH] fix some compile problems with mingw --- contrib/examples/sntp/sntp_example.c | 28 +++++++++++++-------------- contrib/ports/win32/include/arch/cc.h | 5 +++++ contrib/ports/win32/pcapif_helper.c | 1 - 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/contrib/examples/sntp/sntp_example.c b/contrib/examples/sntp/sntp_example.c index 60178bff..e9f6ac86 100644 --- a/contrib/examples/sntp/sntp_example.c +++ b/contrib/examples/sntp/sntp_example.c @@ -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: * * 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 * and/or other materials provided with the distribution. * 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 - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * 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 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * 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 * OF SUCH DAMAGE. * * This file is part of the lwIP TCP/IP stack. - * + * * Author: Dirk Ziegelmeier * */ @@ -41,12 +41,12 @@ sntp_set_system_time(u32_t sec) struct tm current_time_val; time_t current_time = (time_t)sec; -#ifdef _MSC_VER +#if defined(_WIN32) || defined(WIN32) localtime_s(¤t_time_val, ¤t_time); #else localtime_r(¤t_time, ¤t_time_val); #endif - + strftime(buf, sizeof(buf), "%d.%m.%Y %H:%M:%S", ¤t_time_val); LWIP_PLATFORM_DIAG(("SNTP time: %s\n", buf)); } diff --git a/contrib/ports/win32/include/arch/cc.h b/contrib/ports/win32/include/arch/cc.h index b738d67c..0a0c0321 100644 --- a/contrib/ports/win32/include/arch/cc.h +++ b/contrib/ports/win32/include/arch/cc.h @@ -50,6 +50,11 @@ #define LWIP_PROVIDE_ERRNO /* provide errno for non-MSVC */ #endif /* _MSC_VER */ +#ifdef __GNUC__ +#define LWIP_TIMEVAL_PRIVATE 0 +#include +#endif + /* Define platform endianness (might already be defined) */ #ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN diff --git a/contrib/ports/win32/pcapif_helper.c b/contrib/ports/win32/pcapif_helper.c index bc6ca8d8..d0a335b1 100644 --- a/contrib/ports/win32/pcapif_helper.c +++ b/contrib/ports/win32/pcapif_helper.c @@ -102,7 +102,6 @@ pcapifh_alloc_readonly_copy(void *data, size_t len) lwip_win32_platform_diag("VirtualProtect failed: %d\n", GetLastError()); while(1); } - printf("pcapifh_alloc_readonly_copy(%d): 0x%08x\n", len, ret); return ret; }