Quiet a few MSC compiler warnings.

adunstan · adunstan · commit 33a7101281c6 · 2012-10-07T17:31:10.000-04:00
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
@@ -1360,4 +1360,6 @@ get_object_property_data(Oid class_id)
 
 	ereport(ERROR,
 			(errmsg_internal("unrecognized class id: %u", class_id)));
+
+	return NULL; /* keep MSC compiler happy */
 }
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
@@ -68,6 +68,9 @@
 
 #include "postgres.h"
 
+#ifdef _MSCVER
+#include <float.h> /* for _isnan */
+#endif
 #include <math.h>
 
 #include "access/htup_details.h"
diff --git a/src/backend/utils/adt/array_selfuncs.c b/src/backend/utils/adt/array_selfuncs.c
@@ -571,7 +571,7 @@ mcelem_array_contain_overlap_selec(Datum *mcelem, int nmcelem,
 	else
 	{
 		/* Without statistics make some default assumptions */
-		minfreq = 2 * DEFAULT_CONTAIN_SEL;
+		minfreq = 2 * (float4) DEFAULT_CONTAIN_SEL;
 	}
 
 	/* Decide whether it is faster to use binary search or not. */
diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
@@ -65,6 +65,7 @@ ecpg_type_name(enum ECPGttype typ)
 		default:
 			abort();
 	}
+	return ""; /* keep MSC compiler happy */
 }
 
 int

Original file line number	Diff line number	Diff line change
`@@ -1360,4 +1360,6 @@ get_object_property_data(Oid class_id)`
`1360`	`1360`
`1361`	`1361`	`ereport(ERROR,`
`1362`	`1362`	`(errmsg_internal("unrecognized class id: %u", class_id)));`
	`1363`	`+`
	`1364`	`+ return NULL; /* keep MSC compiler happy */`
`1363`	`1365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ mcelem_array_contain_overlap_selec(Datum *mcelem, int nmcelem,`
`571`	`571`	`else`
`572`	`572`	`{`
`573`	`573`	`/* Without statistics make some default assumptions */`
`574`		`- minfreq = 2 * DEFAULT_CONTAIN_SEL;`
	`574`	`+ minfreq = 2 * (float4) DEFAULT_CONTAIN_SEL;`
`575`	`575`	`}`
`576`	`576`
`577`	`577`	`/* Decide whether it is faster to use binary search or not. */`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ ecpg_type_name(enum ECPGttype typ)`
`65`	`65`	`default:`
`66`	`66`	`abort();`
`67`	`67`	`}`
	`68`	`+ return ""; /* keep MSC compiler happy */`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`int`