comparison 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
comparison
equal deleted inserted replaced
5921:68639fb08af8 5922:4b055de36bb9
374 EXFUN (Fcanonicalize_number, 1); 374 EXFUN (Fcanonicalize_number, 1);
375 375
376 #define NUMBER_TYPES(prefix) prefix##FIXNUM_T, prefix##BIGNUM_T, \ 376 #define NUMBER_TYPES(prefix) prefix##FIXNUM_T, prefix##BIGNUM_T, \
377 prefix##RATIO_T, prefix##FLOAT_T, prefix##BIGFLOAT_T 377 prefix##RATIO_T, prefix##FLOAT_T, prefix##BIGFLOAT_T
378 378
379 #ifdef _MSC_VER
380 /* Disable warning 4003:
381 * warning C4003: not enough actual parameters for macro 'NUMBER_TYPES'
382 */
383 #pragma warning( push )
384 #pragma warning( disable : 4003)
385 #endif
386
379 enum number_type { NUMBER_TYPES() }; 387 enum number_type { NUMBER_TYPES() };
380 enum lazy_number_type { NUMBER_TYPES(LAZY_), LAZY_MARKER_T }; 388 enum lazy_number_type { NUMBER_TYPES(LAZY_), LAZY_MARKER_T };
389
390 #ifdef _MSC_VER
391 #pragma warning( pop )
392 #endif
381 393
382 #undef NUMBER_TYPES 394 #undef NUMBER_TYPES
383 395
384 extern enum number_type get_number_type (Lisp_Object); 396 extern enum number_type get_number_type (Lisp_Object);
385 extern enum number_type promote_args (Lisp_Object *, Lisp_Object *); 397 extern enum number_type promote_args (Lisp_Object *, Lisp_Object *);