(CHECK) [ENABLE_CHECKING]: Make both side of the

conditional have void type, for standard C compilers.

diff --git a/src/ChangeLog b/src/ChangeLog
index d614a44efb0923aaa59f5970f1d3762c5af9cd27..6756de20b0b19a8fe842cf5fd11592733c08b0da 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-08-18  Gerd Moellmann  <gerd@gnu.org>
+
+       * lisp.h (CHECK) [ENABLE_CHECKING]: Make both side of the
+       conditional have void type, for standard C compilers.
+
+       * xdisp.c (redisplay_internal): Compare windows for equality with
+       EQ, instead of applying XWINDOW to something that might not
+       be a window.
+       
 2000-08-18  Kenichi Handa  <handa@etl.go.jp>
 
        * fontset.c (Finternal_char_font): Search only the selected frame

diff --git a/src/lisp.h b/src/lisp.h
index f79e211f65533929484748f1283ef94a1adaa8ec..7d8f2d460105a0b5f465bd475f5e92ff683bd183 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -53,7 +53,7 @@ extern void die P_((const char *, const char *, int));
 #ifdef ENABLE_CHECKING
 
 #define CHECK(check,msg) ((check || suppress_checking          \
-                          ? 0                                  \
+                          ? (void) 0                           \
                           : die (msg, __FILE__, __LINE__)),    \
                          0)