(abs): #undef before #define.

4 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2fc471131ae..c9b38825527 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-14  Peter O'Gorman <bug-gnu-emacs@mlists.thewrittenword.com> (tiny change)
+        * gtkutil.c (xg_get_file_with_chooser): Move GCPRO1 after declarations.
+
+        * termhooks.h (enum event_kind): Remove trailing comma.
+
+        * frame.h (enum): Remove trailing comma.
+
+2007-09-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * keyboard.c, xterm.c, xfaces.c (abs): #undef before #define.
+
 2007-09-12  Glenn Morris  <rgm@gnu.org>
 
         * gtkutil.c (cnt): Rename to menu_grab_callback_cnt for clarity.
diff --git a/src/keyboard.c b/src/keyboard.c
index 99fd3419737..c398a85684d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -112,6 +112,7 @@ extern int input_fd;
 #define KBD_BUFFER_SIZE 4096
 #endif  /* No X-windows */
 
+#undef abs
 #define abs(x)          ((x) >= 0 ? (x) : -(x))
 
 /* Following definition copied from eval.c */
diff --git a/src/xfaces.c b/src/xfaces.c
index 26c98c41652..418d8922bb3 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -264,6 +264,7 @@ Boston, MA 02110-1301, USA.  */
 
 #include <ctype.h>
 
+#undef abs
 #define abs(X)          ((X) < 0 ? -(X) : (X))
 
 /* Number of pt per inch (from the TeXbook).  */
diff --git a/src/xterm.c b/src/xterm.c
index bb25fba5f87..ba1102c65d0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -155,6 +155,7 @@ extern void _XEditResCheckMessages ();
 #endif
 #endif
 
+#undef abs
 #define abs(x)  ((x) < 0 ? -(x) : (x))
 
 /* Default to using XIM if available.  */