* lisp.h (NO_UNION_TYPE) [ENABLE_CHECKING]: Undef.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1d09e191d7d240d71f3b52504bbfcac7c85ab433..9f673eb7529ff0ec3c3ea08def4fffd663e39cb6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2000-03-30  Ken Raeburn  <raeburn@gnu.org>
 
+       * lisp.h (NO_UNION_TYPE) [ENABLE_CHECKING]: Undef.
+
        * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW,
        XSUBR, XBUFFER): Verify correct object type before returning
        pointer, using eassert.

diff --git a/src/lisp.h b/src/lisp.h
index 13e734a73eab88362a51ec951fa0cbebdfd6bf7f..10749473be701787fbc4c4724b9662503570df4f 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -48,13 +48,25 @@ Boston, MA 02111-1307, USA.  */
 
 /* Extra internal type checking?  */
 extern int suppress_checking;
-#ifdef ENABLE_CHECKING
 extern void die P_((const char *, const char *, int));
-#define CHECK(check,msg) ((check || suppress_checking ? 0 : die (msg, __FILE__, __LINE__)), 0)
+
+#ifdef ENABLE_CHECKING
+
+#define CHECK(check,msg) ((check || suppress_checking          \
+                          ? 0                                  \
+                          : die (msg, __FILE__, __LINE__)),    \
+                         0)
+
+/* Let's get some compile-time checking too.  */
+#undef NO_UNION_TYPE
+
 #else
+
 /* Produce same side effects and result, but don't complain.  */
 #define CHECK(check,msg) ((check),0)
+
 #endif
+
 /* Define an Emacs version of "assert", since some system ones are
    flaky.  */
 #if defined (__GNUC__) && __GNUC__ >= 2 && defined (__STDC__)