aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/lisp.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d614a44efb..6756de20b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-08-18 Gerd Moellmann <[email protected]>
+
+ * 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 <[email protected]>
* fontset.c (Finternal_char_font): Search only the selected frame
diff --git a/src/lisp.h b/src/lisp.h
index f79e211f65..7d8f2d4601 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)