mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 11:26:16 +01:00
Merge branch 'isnan-msvc' into 'master'
gdatetime.c: Fix MSVC builds for lack of NAN items See merge request GNOME/glib!1837
This commit is contained in:
commit
be39b8fab4
@ -80,6 +80,11 @@
|
||||
#ifndef G_OS_WIN32
|
||||
#include <sys/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 */
|
||||
|
||||
/**
|
||||
|
@ -29,6 +29,10 @@
|
||||
#ifdef G_OS_WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
|
||||
#ifndef NAN
|
||||
#define NAN HUGE_VAL * 0.0f
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define ASSERT_DATE(dt,y,m,d) G_STMT_START { \
|
||||
|
Loading…
Reference in New Issue
Block a user