luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 20:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'isnan-msvc' into 'master'

Browse Source 
gdatetime.c: Fix MSVC builds for lack of NAN items

See merge request GNOME/glib!1837
This commit is contained in:
Sebastian Dröge 2021-01-04 15:59:17 +00:00
commit be39b8fab4
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gdatetime.c
View File

@ -80,6 +80,11 @@
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#else
#if defined (_MSC_VER) && (_MSC_VER < 1800)
/* fallback implementation for isnan() on VS2012 and earlier */
#define isnan _isnan
#endif
#endif /* !G_OS_WIN32 */ #endif /* !G_OS_WIN32 */
/** /**

4
glib/tests/gdatetime.c
View File

@ -29,6 +29,10 @@
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#ifndef NAN
#define NAN HUGE_VAL * 0.0f
#endif
#endif #endif
#define ASSERT_DATE(dt,y,m,d) G_STMT_START { \ #define ASSERT_DATE(dt,y,m,d) G_STMT_START { \