6 files changed, 6 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3ba10216c6..fca20e67e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-23  Johannes Weiner  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* term.c (DEV_TTY): New macro.  Provide a definition for
diff --git a/src/keyboard.c b/src/keyboard.c
index 79b9ca32a6..0e9dfee877 100644
--- 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 8b1bda8d6e..0873fe8b82 100644
--- 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 b072c900ca..0eab8f31b9 100644
--- 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))
-
 
 /* Fringe bitmaps.  */
 
diff --git a/src/xfaces.c b/src/xfaces.c
index a1573235cd..b1fcf28d9c 100644
--- 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 c67238b223..0b6504bd23 100644
--- 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;