diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-15 05:03:21 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-15 05:03:21 +0000 |
| commit | 63655c83146b773b4ef3d9220b4a9d61545fd050 (patch) | |
| tree | 2161d262bba2c99b0db2ed8b322eddcafeadd247 /src/lisp.h | |
| parent | ce8f7ca45fabe11ce32a9ced2b8e7c1987c0d997 (diff) | |
| parent | b2529d56b5126319a1659dc1530d6fc102cc21d6 (diff) | |
| download | emacs-63655c83146b773b4ef3d9220b4a9d61545fd050.tar.gz | |
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
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lisp.h b/src/lisp.h index 50750af3c4f..231cfcc7379 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3368,9 +3368,11 @@ extern Lisp_Object Vdirectory_sep_char; #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 |