diff --git a/src/ChangeLog b/src/ChangeLog
index 95bfd00b509..cc88f58198a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-31  Gerd Moellmann  <gerd@gnu.org>
+
+	* dispnew.c (find_glyph_row_slice, swap_glyphs_in_rows): Put
+	in #if 0.
+
+	* lisp.h (eassert) [!ENABLE_CHECKING]: Define as `(void) 0'.
+
 2000-05-31  Jason Rumney  <jasonr@gnu.org>
 
 	* search.c (Fre_search_forward, Fre_search_backward)
diff --git a/src/lisp.h b/src/lisp.h
index d4f7aaa981a..8c78ba7edb3 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -69,11 +69,15 @@ extern void die P_((const char *, const char *, int));
 
 /* Define an Emacs version of "assert", since some system ones are
    flaky.  */
+#ifndef ENABLE_CHECKING
+#define eassert(X)	(void) 0
+#else /* ENABLE_CHECKING */
 #if defined (__GNUC__) && __GNUC__ >= 2 && defined (__STDC__)
 #define eassert(cond) CHECK(cond,"assertion failed: " #cond)
 #else
 #define eassert(cond) CHECK(cond,"assertion failed")
 #endif
+#endif /* ENABLE_CHECKING */
 
 /* Define the fundamental Lisp data structures.  */