Mercurial > hg > xemacs-beta
changeset 5331:7ea837399734
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 | fbafdc1bb4d2 |
| children | 1dbc93b7ba19 |
| files | src/ChangeLog src/fns.c |
| diffstat | 2 files changed, 37 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jan 02 17:04:13 2011 +0000 +++ b/src/ChangeLog Sun Jan 02 17:37:17 2011 +0000 @@ -1,3 +1,11 @@ +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. + 2011-01-01 Aidan Kehoe <kehoea@parhasard.net> * data.c (print_ephemeron, print_weak_list, print_weak_box):
--- a/src/fns.c Sun Jan 02 17:04:13 2011 +0000 +++ b/src/fns.c Sun Jan 02 17:37:17 2011 +0000 @@ -62,7 +62,7 @@ Lisp_Object Q_start1, Q_start2, Q_end1, Q_end2, Q_if_, Q_if_not, Q_stable; Lisp_Object Q_test_not, Q_count, Qnsubstitute, Qdelete_duplicates, Qmismatch; -Lisp_Object Qintersection, Qnintersection, Qset_difference, Qnset_difference; +Lisp_Object Qintersection, Qset_difference, Qnset_difference; Lisp_Object Qnunion, Qnintersection, Qsubsetp, Qnset_difference; Lisp_Object Qbase64_conversion_error; @@ -3280,15 +3280,17 @@ if (!NILP (count)) { CHECK_INTEGER (count); - if (BIGNUMP (count)) + if (INTP (count)) + { + counting = XINT (count); + } +#ifdef HAVE_BIGNUM + else { counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 1 + EMACS_INT_MAX : EMACS_INT_MIN - 1; } - else - { - counting = XINT (count); - } +#endif if (counting < 1) { @@ -3625,15 +3627,17 @@ if (!NILP (count)) { CHECK_INTEGER (count); - if (BIGNUMP (count)) + if (INTP (count)) + { + counting = XINT (count); + } +#ifdef HAVE_BIGNUM + else { counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN; } - else - { - counting = XINT (count); - } +#endif if (counting <= 0) { @@ -8679,15 +8683,17 @@ if (!NILP (count)) { CHECK_INTEGER (count); - if (BIGNUMP (count)) + if (INTP (count)) + { + counting = XINT (count); + } +#ifdef HAVE_BIGNUM + else { counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN; } - else - { - counting = XINT (count); - } +#endif if (counting <= 0) { @@ -8944,15 +8950,17 @@ if (!NILP (count)) { CHECK_INTEGER (count); - if (BIGNUMP (count)) + if (INTP (count)) + { + counting = XINT (count); + } +#ifdef HAVE_BIGNUM + else { counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ? 1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN; } - else - { - counting = XINT (count); - } +#endif if (counting <= 0) { @@ -11722,7 +11730,6 @@ DEFSYMBOL (Qset_difference); DEFSYMBOL (Qnset_difference); DEFSYMBOL (Qnunion); - DEFSYMBOL (Qnintersection); DEFSYMBOL (Qset_difference); DEFSYMBOL (Qnset_difference);