(abs): #undef before #define.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2fc471131aece1193cc7cfa1e9dec94fa03996b3..c9b38825527acb3897b1218b9bb6b63c96895f86 100644 (file)
--- 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\e,Ad\e(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 99fd341973707ec04b592279cc0246dbd45779f9..c398a85684d21bd74317b3c3da3c10b4be1cf994 100644 (file)
--- 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 26c98c416521170c1096c9fe3eabe1f2506f79c0..418d8922bb31b2ea18d16717d56627228b14faba 100644 (file)
--- 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 bb25fba5f8768764be6c6ff450b49e9df7e8136c..ba1102c65d072efedef2812d953849f48b00b8b1 100644 (file)
--- 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.  */