From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 18 Aug 2000 05:18:44 +0000 (+0000)
Subject: (CHECK) [ENABLE_CHECKING]: Make both side of the
X-Git-Tag: emacs-pretest-21.0.90~2184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7eb9e30d9d162b854a5832c1204ce244a5026266;p=emacs.git

(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 d614a44efb0..6756de20b0b 100644
--- 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 f79e211f655..7d8f2d46010 100644
--- 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)