Mercurial > hg > xemacs-beta

comparison src/fns.c @ 5331:7ea837399734

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid duplicate declarations, assumptions about HAVE_BIGNUM, fns.c src/ChangeLog addition: 2011-01-02 Aidan Kehoe <kehoea@parhasard.net> * fns.c (FdeleteX, FremoveX, Fnsubstitute, Fsubstitute, syms_of_fns): Don't repeat the declaration and DEFSYMBOL() for Qnintersection in this file; don't assume that bignums are always available. Fixes some of the build problems the buildbot is showing me at the moment.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 02 Jan 2011 17:37:17 +0000
parents d1b17a33450b
children 1dbc93b7ba19
comparison
equal deleted inserted replaced
5330:fbafdc1bb4d2 5331:7ea837399734
60 Lisp_Object Qmapconcat, QmapcarX, Qmapvector, Qmapcan, Qmapc, Qmap, Qmap_into; 60 Lisp_Object Qmapconcat, QmapcarX, Qmapvector, Qmapcan, Qmapc, Qmap, Qmap_into;
61 Lisp_Object Qsome, Qevery, Qmaplist, Qmapl, Qmapcon, Qreduce, Qsubstitute; 61 Lisp_Object Qsome, Qevery, Qmaplist, Qmapl, Qmapcon, Qreduce, Qsubstitute;
62 Lisp_Object Q_start1, Q_start2, Q_end1, Q_end2, Q_if_, Q_if_not, Q_stable; 62 Lisp_Object Q_start1, Q_start2, Q_end1, Q_end2, Q_if_, Q_if_not, Q_stable;
63 Lisp_Object Q_test_not, Q_count, Qnsubstitute, Qdelete_duplicates, Qmismatch; 63 Lisp_Object Q_test_not, Q_count, Qnsubstitute, Qdelete_duplicates, Qmismatch;
64 64
65 Lisp_Object Qintersection, Qnintersection, Qset_difference, Qnset_difference; 65 Lisp_Object Qintersection, Qset_difference, Qnset_difference;
66 Lisp_Object Qnunion, Qnintersection, Qsubsetp, Qnset_difference; 66 Lisp_Object Qnunion, Qnintersection, Qsubsetp, Qnset_difference;
67 67
68 Lisp_Object Qbase64_conversion_error; 68 Lisp_Object Qbase64_conversion_error;
69 69
70 Lisp_Object Vpath_separator; 70 Lisp_Object Vpath_separator;
3278 if (!UNBOUNDP (count)) 3278 if (!UNBOUNDP (count))
3279 { 3279 {
3280 if (!NILP (count)) 3280 if (!NILP (count))
3281 { 3281 {
3282 CHECK_INTEGER (count); 3282 CHECK_INTEGER (count);
3283 if (BIGNUMP (count)) 3283 if (INTP (count))
3284 {
3285 counting = XINT (count);
3286 }
3287 #ifdef HAVE_BIGNUM
3288 else
3284 { 3289 {
3285 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 3290 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ?
3286 1 + EMACS_INT_MAX : EMACS_INT_MIN - 1; 3291 1 + EMACS_INT_MAX : EMACS_INT_MIN - 1;
3287 } 3292 }
3288 else 3293 #endif
3289 {
3290 counting = XINT (count);
3291 }
3292 3294
3293 if (counting < 1) 3295 if (counting < 1)
3294 { 3296 {
3295 return sequence; 3297 return sequence;
3296 } 3298 }
3623 } 3625 }
3624 3626
3625 if (!NILP (count)) 3627 if (!NILP (count))
3626 { 3628 {
3627 CHECK_INTEGER (count); 3629 CHECK_INTEGER (count);
3628 if (BIGNUMP (count)) 3630 if (INTP (count))
3631 {
3632 counting = XINT (count);
3633 }
3634 #ifdef HAVE_BIGNUM
3635 else
3629 { 3636 {
3630 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 3637 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ?
3631 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN; 3638 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN;
3632 } 3639 }
3633 else 3640 #endif
3634 {
3635 counting = XINT (count);
3636 }
3637 3641
3638 if (counting <= 0) 3642 if (counting <= 0)
3639 { 3643 {
3640 return sequence; 3644 return sequence;
3641 } 3645 }
8677 } 8681 }
8678 8682
8679 if (!NILP (count)) 8683 if (!NILP (count))
8680 { 8684 {
8681 CHECK_INTEGER (count); 8685 CHECK_INTEGER (count);
8682 if (BIGNUMP (count)) 8686 if (INTP (count))
8687 {
8688 counting = XINT (count);
8689 }
8690 #ifdef HAVE_BIGNUM
8691 else
8683 { 8692 {
8684 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 8693 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ?
8685 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN; 8694 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN;
8686 } 8695 }
8687 else 8696 #endif
8688 {
8689 counting = XINT (count);
8690 }
8691 8697
8692 if (counting <= 0) 8698 if (counting <= 0)
8693 { 8699 {
8694 return sequence; 8700 return sequence;
8695 } 8701 }
8942 if (!UNBOUNDP (count)) 8948 if (!UNBOUNDP (count))
8943 { 8949 {
8944 if (!NILP (count)) 8950 if (!NILP (count))
8945 { 8951 {
8946 CHECK_INTEGER (count); 8952 CHECK_INTEGER (count);
8947 if (BIGNUMP (count)) 8953 if (INTP (count))
8954 {
8955 counting = XINT (count);
8956 }
8957 #ifdef HAVE_BIGNUM
8958 else
8948 { 8959 {
8949 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 8960 counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ?
8950 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN; 8961 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN;
8951 } 8962 }
8952 else 8963 #endif
8953 {
8954 counting = XINT (count);
8955 }
8956 8964
8957 if (counting <= 0) 8965 if (counting <= 0)
8958 { 8966 {
8959 return sequence; 8967 return sequence;
8960 } 8968 }
11720 DEFSYMBOL (Qnintersection); 11728 DEFSYMBOL (Qnintersection);
11721 DEFSYMBOL (Qsubsetp); 11729 DEFSYMBOL (Qsubsetp);
11722 DEFSYMBOL (Qset_difference); 11730 DEFSYMBOL (Qset_difference);
11723 DEFSYMBOL (Qnset_difference); 11731 DEFSYMBOL (Qnset_difference);
11724 DEFSYMBOL (Qnunion); 11732 DEFSYMBOL (Qnunion);
11725 DEFSYMBOL (Qnintersection);
11726 DEFSYMBOL (Qset_difference); 11733 DEFSYMBOL (Qset_difference);
11727 DEFSYMBOL (Qnset_difference); 11734 DEFSYMBOL (Qnset_difference);
11728 11735
11729 DEFKEYWORD (Q_from_end); 11736 DEFKEYWORD (Q_from_end);
11730 DEFKEYWORD (Q_initial_value); 11737 DEFKEYWORD (Q_initial_value);