Remove left over code.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b04cafced46e820b24f2c1a31b8d2ee9f7563e1..90b18d1d78b8ce478578d1697f0611dc430960c9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-11  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * lisp.h: Remove left over code.
+
 2008-07-11  Andreas Schwab  <schwab@suse.de>
 
        * lisp.h: Fix logic in last change.

diff --git a/src/lisp.h b/src/lisp.h
index 86c5cac319c929d7e276e730dec34fd2b49a6382..5216b7a72f8436341580efac29e666965b120e75 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -108,13 +108,6 @@ extern void die P_((const char *, const char *, int)) NO_RETURN;
 
 #endif
 
-/* Used for making sure that Emacs is compilable in all
-   configurations.  */
-
-#ifdef USE_LISP_UNION_TYPE
-#undef NO_UNION_TYPE
-#endif
-
 /* Define an Emacs version of "assert", since some system ones are
    flaky.  */
 #ifndef ENABLE_CHECKING
@@ -127,6 +120,11 @@ extern void die P_((const char *, const char *, int)) NO_RETURN;
 #endif
 #endif /* ENABLE_CHECKING */
 \f
+/* Define this to make Lisp_Object use a union type instead of the
+   default int.  FIXME: It might be better to add a flag to configure
+   to do this.  */
+/* #define USE_LISP_UNION_TYPE */
+
 /***** Select the tagging scheme.  *****/
 /* There are basically two options that control the tagging scheme:
    - USE_LISP_UNION_TYPE says that Lisp_Object should be a union instead