Mercurial > emacs
diff src/lisp.h @ 91053:a0e466c4d599
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 887-889)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 116-121)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-268
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 15 Oct 2007 05:03:21 +0000 |
parents | d38543a1c0f9 2acb83e611e8 |
children | 1251cabc40b7 |
line wrap: on
line diff
--- a/src/lisp.h Mon Oct 15 04:54:31 2007 +0000 +++ b/src/lisp.h Mon Oct 15 05:03:21 2007 +0000 @@ -3368,9 +3368,11 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) -/* Make sure we have abs defined */ -#if !defined(abs) -#define abs(x) ((x) < 0 ? -(x) : (x)) +/* We used to use `abs', but that clashes with system headers on some + platforms, and using a name reserved by Standard C is a bad idea + anyway. */ +#if !defined(eabs) +#define eabs(x) ((x) < 0 ? -(x) : (x)) #endif /* Return a fixnum or float, depending on whether VAL fits in a Lisp