Commit a7ad3fd3 authored by Philip Withnall's avatar Philip Withnall
Browse files

Merge branch '266.c89' into 'glib-2-66'

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

See merge request !1831
parents 55ebcf05 d6e5db6e
Pipeline #243826 passed with stages
in 10 minutes and 5 seconds
......@@ -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 { \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment