Mercurial > hg > xemacs-beta
changeset 2001:cc5b615380f8
[xemacs-hg @ 2004-04-08 15:23:07 by james]
Various fixes to repair the C++ build.
| author | james |
|---|---|
| date | Thu, 08 Apr 2004 15:23:09 +0000 |
| parents | 645edb8ae417 |
| children | e984a39fe3a3 |
| files | src/ChangeLog src/data.c src/number.c src/print.c |
| diffstat | 4 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Apr 07 21:51:29 2004 +0000 +++ b/src/ChangeLog Thu Apr 08 15:23:09 2004 +0000 @@ -1,3 +1,12 @@ +2004-04-08 Jerry James <james@xemacs.org> + + * data.c: Use #ifndef for functions unused with new number types. + * data.c (digit_to_number): Unused when HAVE_BIGNUM. + * number.c: Remove multiply defined symbols Qintegerp & Qnumberp. + * number.c (syms_of_number): DEFSUBR(Ffloatingp) was omitted. + * print.c (print_internal): g++ thinks that specdepth might be + used undefined. It isn't, but the compiler can't tell. + 2004-04-07 Jerry James <james@xemacs.org> * number.c (Fevenp): Change the C boolean into Qnil/Qt. Thanks to
--- a/src/data.c Wed Apr 07 21:51:29 2004 +0000 +++ b/src/data.c Thu Apr 08 15:23:09 2004 +0000 @@ -836,6 +836,7 @@ /**********************************************************************/ /* Arithmetic functions */ /**********************************************************************/ +#ifndef WITH_NUMBER_TYPES typedef struct { int int_p; @@ -876,6 +877,7 @@ goto retry; } } +#endif /* WITH_NUMBER_TYPES */ static EMACS_INT integer_char_or_marker_to_int (Lisp_Object obj) @@ -1213,6 +1215,7 @@ } } +#ifndef HAVE_BIGNUM static int digit_to_number (int character, int base) { @@ -1224,6 +1227,7 @@ return digit >= base ? -1 : digit; } +#endif DEFUN ("string-to-number", Fstring_to_number, 1, 2, 0, /* Convert STRING to a number by parsing it as a number in base BASE.
--- a/src/number.c Wed Apr 07 21:51:29 2004 +0000 +++ b/src/number.c Thu Apr 08 15:23:09 2004 +0000 @@ -24,7 +24,7 @@ #include <limits.h> #include "lisp.h" -Lisp_Object Qintegerp, Qrationalp, Qfloatingp, Qrealp, Qnumberp; +Lisp_Object Qrationalp, Qfloatingp, Qrealp; Lisp_Object Vdefault_float_precision; Fixnum Vmost_negative_fixnum, Vmost_positive_fixnum; static Lisp_Object Qunsupported_type; @@ -707,11 +707,9 @@ #endif /* Type predicates */ - DEFSYMBOL (Qintegerp); DEFSYMBOL (Qrationalp); DEFSYMBOL (Qfloatingp); DEFSYMBOL (Qrealp); - DEFSYMBOL (Qnumberp); #ifndef HAVE_BIGNUM DEFSYMBOL (Qbignump); #endif @@ -732,6 +730,7 @@ DEFSUBR (Fnumerator); DEFSUBR (Fdenominator); DEFSUBR (Fbigfloatp); + DEFSUBR (Ffloatingp); DEFSUBR (Frealp); DEFSUBR (Fcanonicalize_number); DEFSUBR (Fcoerce_number);