From ac25ba0a3f1ffb797e91e335654e91b8778aff4a Mon Sep 17 00:00:00 2001
From: Photonios <photonios@outlook.com>
Date: Tue, 22 Sep 2015 18:25:53 +0200
Subject: [PATCH] Fix for MSVC 2015: isnan is supported in this version

---
 psycopg/config.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/psycopg/config.h b/psycopg/config.h
index b6cd4190..255fc3a7 100644
--- a/psycopg/config.h
+++ b/psycopg/config.h
@@ -129,14 +129,15 @@ static int pthread_mutex_init(pthread_mutex_t *mutex, void* fake)
 /* remove the inline keyword, since it doesn't work unless C++ file */
 #define inline
 
-/* Hmmm, MSVC doesn't have a isnan/isinf function, but has _isnan function */
+/* Hmmm, MSVC <2015 doesn't have a isnan/isinf function, but has _isnan function */
 #if defined (_MSC_VER)
+#if !defined(isnan)
 #define isnan(x) (_isnan(x))
 /* The following line was hacked together from simliar code by Bjorn Reese
  * in libxml2 code */
 #define isinf(x) ((_fpclass(x) == _FPCLASS_PINF) ? 1 \
 	: ((_fpclass(x) == _FPCLASS_NINF) ? -1 : 0))
-
+#endif
 #define strcasecmp(x, y) lstrcmpi(x, y)
 #endif
 #endif