diff options
| -rw-r--r-- | src/backend/catalog/objectaddress.c | 2 | ||||
| -rw-r--r-- | src/backend/optimizer/path/costsize.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/adt/array_selfuncs.c | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/typename.c | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index b3b2bc688ec..d7a726c2c4a 100644 --- 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 index 3e99b230f5b..544b63f149e 100644 --- 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 index 622d6d13cee..03f703c2dee 100644 --- 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 index 98b81894f35..d0081812f3d 100644 --- 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 |