Johannes Weiner <hannes at saeurebad.de>

(abs): Don't define abs now it's in lisp.h.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ba10216c6aa7b16de08151467d4ec83b6f2c454..fca20e67e3dbc943221d9c6d17ea7dc2c1785adb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-23  Johannes Weiner  <hannes@saeurebad.de>
+
+       * lisp.h (abs): Define if unknown.
+       * keyboard.c, sound.c, w32term.c, xfaces.c, w32term.c: Don't
+       define abs now it's in lisp.h.
+
 2007-09-22  Eli Zaretskii  <eliz@gnu.org>
 
        * term.c (DEV_TTY): New macro.  Provide a definition for

diff --git a/src/keyboard.c b/src/keyboard.c
index 79b9ca32a61475cd622f9850f3e51bd02a2a216b..0e9dfee877fa1f22b1eae007e0ef5f800955af31 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -108,8 +108,6 @@ int interrupt_input_pending;
 #define KBD_BUFFER_SIZE 4096
 #endif /* No X-windows */
 
-#define abs(x)         ((x) >= 0 ? (x) : -(x))
-
 /* Following definition copied from eval.c */
 
 struct backtrace

diff --git a/src/sound.c b/src/sound.c
index 8b1bda8d6eff4056c25adad0acbdaddb0d9fded0..0873fe8b82facf3913b1dd5d504f605c53c802de 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -97,7 +97,6 @@ Boston, MA 02110-1301, USA.  */
 #endif /* WINDOWSNT */
 
 /* BEGIN: Common Definitions */
-#define abs(X)    ((X) < 0 ? -(X) : (X))
 
 /* Symbols.  */
 

diff --git a/src/w32term.c b/src/w32term.c
index b072c900cac77d3a8cb1f2a0abee1d303f920dee..0eab8f31b9844c9a228869f207dcafa83a29f100 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -58,8 +58,6 @@ Boston, MA 02110-1301, USA.  */
 #include "composite.h"
 #include "coding.h"
 
-#define abs(x) ((x) < 0 ? -(x) : (x))
-
 \f
 /* Fringe bitmaps.  */
 

diff --git a/src/xfaces.c b/src/xfaces.c
index a1573235cd0d7f92e9271ca08451c03fbbeefc65..b1fcf28d9c3f84799dbb40e70f3702aa51bba6f8 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -267,8 +267,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <ctype.h>
 
-#define abs(X)         ((X) < 0 ? -(X) : (X))
-
 /* Number of pt per inch (from the TeXbook).  */
 
 #define PT_PER_INCH 72.27

diff --git a/src/xterm.c b/src/xterm.c
index c67238b2234eafa3ee1687ce66d8678d93ec4d38..0b6504bd23242c772cd5827728c706f644d29d3d 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -154,8 +154,6 @@ extern void _XEditResCheckMessages ();
 #endif
 #endif
 
-#define abs(x) ((x) < 0 ? -(x) : (x))
-
 /* Default to using XIM if available.  */
 #ifdef USE_XIM
 int use_xim = 1;