Mercurial > emacs
comparison src/lisp.h @ 83414:14a4eb789b45
Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-672
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-673
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-674
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-675
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-169
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-170
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-171
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-172
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-173
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-454
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 19 Dec 2005 19:57:22 +0000 |
parents | 69e184bbba16 b23a7ce63153 |
children | fe870a866ce7 |
comparison
equal
deleted
inserted
replaced
83413:e26e2265dcc6 | 83414:14a4eb789b45 |
---|---|
452 (__extension__ ({ Lisp_Object _l; _l.s.val = (N); _l.s.type = Lisp_Int; _l; })) | 452 (__extension__ ({ Lisp_Object _l; _l.s.val = (N); _l.s.type = Lisp_Int; _l; })) |
453 #else | 453 #else |
454 extern Lisp_Object make_number P_ ((EMACS_INT)); | 454 extern Lisp_Object make_number P_ ((EMACS_INT)); |
455 #endif | 455 #endif |
456 | 456 |
457 #define EQ(x, y) ((x).s.val == (y).s.val && (x).s.type == (y).s.type) | 457 #define EQ(x, y) ((x).i == (y).i) |
458 | 458 |
459 #endif /* NO_UNION_TYPE */ | 459 #endif /* NO_UNION_TYPE */ |
460 | 460 |
461 /* During garbage collection, XGCTYPE must be used for extracting types | 461 /* During garbage collection, XGCTYPE must be used for extracting types |
462 so that the mark bit is ignored. XMARKBIT accesses the markbit. | 462 so that the mark bit is ignored. XMARKBIT accesses the markbit. |