yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix compilation with MinGW32

Browse source 
Signed-off-by: Cameron Cawley <ccawley2011@gmail.com>
This commit is contained in:
Cameron Cawley 2021-03-08 23:29:26 +00:00 committed by Dave Rodgman
parent a745c7d439
commit ea5496ceb3
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/platform_util.c
View file

@ -92,9 +92,11 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
* threading.h. However, this macro is not part of the Mbed TLS public API, so * threading.h. However, this macro is not part of the Mbed TLS public API, so
* we keep it private by only defining it in this file * we keep it private by only defining it in this file
*/ */
#if ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) #if ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) || \
( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) )
#define PLATFORM_UTIL_USE_GMTIME #define PLATFORM_UTIL_USE_GMTIME
#endif /* ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) */ #endif /* ! ( defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) ) || \
(defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) ) */
#endif /* !( ( defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L ) || \ #endif /* !( ( defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L ) || \
( defined(_POSIX_THREAD_SAFE_FUNCTIONS ) && \ ( defined(_POSIX_THREAD_SAFE_FUNCTIONS ) && \
@ -103,7 +105,7 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
struct tm *mbedtls_platform_gmtime_r( const mbedtls_time_t *tt, struct tm *mbedtls_platform_gmtime_r( const mbedtls_time_t *tt,
struct tm *tm_buf ) struct tm *tm_buf )
{ {
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #if defined(_WIN32) && !defined(PLATFORM_UTIL_USE_GMTIME)
return( ( gmtime_s( tm_buf, tt ) == 0 ) ? tm_buf : NULL ); return( ( gmtime_s( tm_buf, tt ) == 0 ) ? tm_buf : NULL );
#elif !defined(PLATFORM_UTIL_USE_GMTIME) #elif !defined(PLATFORM_UTIL_USE_GMTIME)
return( gmtime_r( tt, tm_buf ) ); return( gmtime_r( tt, tm_buf ) );

5
tests/suites/helpers.function
View file

@ -44,9 +44,12 @@ typedef UINT32 uint32_t;
#include <string.h> #include <string.h>
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__MINGW32__)
#include <strings.h>
#endif
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <unistd.h> #include <unistd.h>
#include <strings.h>
#endif #endif
/* Type for Hex parameters */ /* Type for Hex parameters */