diff src/number.h @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 4d7032d36975
children 750fab17b299 574f0cded429
line wrap: on
line diff
--- a/src/number.h	Wed Apr 23 22:22:37 2014 +0100
+++ b/src/number.h	Fri Feb 27 17:47:15 2015 +0000
@@ -376,9 +376,21 @@
 #define NUMBER_TYPES(prefix) prefix##FIXNUM_T, prefix##BIGNUM_T, \
     prefix##RATIO_T, prefix##FLOAT_T, prefix##BIGFLOAT_T
 
+#ifdef _MSC_VER
+/* Disable warning 4003:
+ * warning C4003: not enough actual parameters for macro 'NUMBER_TYPES'
+ */
+#pragma warning( push )
+#pragma warning( disable : 4003)
+#endif
+
 enum number_type { NUMBER_TYPES() };
 enum lazy_number_type { NUMBER_TYPES(LAZY_), LAZY_MARKER_T };
 
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
 #undef NUMBER_TYPES
 
 extern enum number_type get_number_type (Lisp_Object);