summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-01-19 14:33:29 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2013-01-19 14:33:29 -0800
commitd7a0a7c9bddcf0b5005c392d5f00702d26cc5b9c (patch)
tree1373e1191aeae638ce6b62ac90b6c2dcdbf04dba /src
parentdd4d3d3a52ef79721f40363e87c725327c2a155b (diff)
downloademacs-d7a0a7c9bddcf0b5005c392d5f00702d26cc5b9c.tar.gz
* lisp.h (eabs): Define unconditionally.
The old "#if !defined (eabs)" was an unnecessary revenant of back when this macro was called "abs". Document 'eabs' better. Fixes: debbugs:13419
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/lisp.h9
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eb393c93c4a..1383b12ed68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * lisp.h (eabs): Define unconditionally (Bug#13419).
+ The old "#if !defined (eabs)" was an unnecessary revenant of back
+ when this macro was called "abs". Document 'eabs' better.
+
2013-01-19 Glenn Morris <rgm@gnu.org>
* fns.c (Frandom): Doc fix.
diff --git a/src/lisp.h b/src/lisp.h
index 48fba653203..faf4b1b8edd 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3711,12 +3711,11 @@ extern char *egetenv (const char *);
/* Set up the name of the machine we're running on. */
extern void init_system_name (void);
-/* 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)
+/* Return the absolute value of X. X should be a signed integer
+ expression without side effects, and X's absolute value should not
+ exceed the maximum for its promoted type. This is called 'eabs'
+ because 'abs' is reserved by the C standard. */
#define eabs(x) ((x) < 0 ? -(x) : (x))
-#endif
/* Return a fixnum or float, depending on whether VAL fits in a Lisp
fixnum. */