* 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

diff --git a/src/ChangeLog b/src/ChangeLog
index eb393c93c4a057723c97a32b21149e38edc94b14..1383b12ed68c8d316bace4df5f801c25d94bdfba 100644 (file)
--- 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 48fba653203c71a275ed0c613bbf9658faab5d6f..faf4b1b8edd1268d8762fb343142367ebb4126d3 100644 (file)
--- 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.  */