Commitd5d7f7f

committed

Silence MSVC warnings about redefinition of isnan

Some versions of perl.h define isnan when the compiler is MSVC. To avoidwarnings about this, undefine the symbol before including perl.h andre-add the definition afterwards if it wasn't recreated.Discussion:https://postgr.es/m/caf0568e-3c1f-07fd-6914-d903f22560f2@2ndQuadrant.com

1 parent0b59b0e commitd5d7f7fCopy full SHA for d5d7f7f

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,15 @@`
`40`	`40`
`41`	`41`	`/*`
`42`	`42`	`* ActivePerl 5.18 and later are MinGW-built, and their headers use GCC's`
`43`		`- * __inline__. Translate to something MSVC recognizes.`
	`43`	`+ * __inline__. Translate to something MSVC recognizes. Also, perl.h sometimes`
	`44`	`+ * defines isnan, so undefine it here and put back the definition later if`
	`45`	`+ * perl.h doesn't.`
`44`	`46`	`*/`
`45`	`47`	`#ifdef_MSC_VER`
`46`	`48`	`#define__inline__ inline`
	`49`	`+#ifdefisname`
	`50`	`+#undef isnan`
	`51`	`+#endif`
`47`	`52`	`#endif`
`48`	`53`
`49`	`54`	`/*`
`@@ -135,6 +140,13 @@`
`135`	`140`	`#definevprintfpg_vprintf`
`136`	`141`	`#defineprintf(...)pg_printf(__VA_ARGS__)`
`137`	`142`
	`143`	`+/* put back the definition of isnan if needed */`
	`144`	`+#ifdef_MSC_VER`
	`145`	`+#ifndefisnan`
	`146`	`+#defineisnan(x) _isnan(x)`
	`147`	`+#endif`
	`148`	`+#endif`
	`149`	`+`
`138`	`150`	`/* perl version and platform portability */`
`139`	`151`	`#defineNEED_eval_pv`
`140`	`152`	`#defineNEED_newRV_noinc`

Comments

(0)