aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2008-07-11 11:39:49 +0000
committerAndreas Schwab2008-07-11 11:39:49 +0000
commit7e770c85dae17a39c39121302f09d4e52ef44890 (patch)
tree609e885ccd522d0b8523d42fcbaf6a90bf239658 /src
parente7c9048f9d548c4dd01853692dfec74d514b5820 (diff)
downloademacs-7e770c85dae17a39c39121302f09d4e52ef44890.tar.gz
emacs-7e770c85dae17a39c39121302f09d4e52ef44890.zip
Fix logic in last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/lisp.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5c5e673f2c0..5b04cafced4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12008-07-11 Andreas Schwab <schwab@suse.de> 12008-07-11 Andreas Schwab <schwab@suse.de>
2 2
3 * lisp.h: Fix logic in last change.
4
3 * menu.h: New file. 5 * menu.h: New file.
4 * menu.c: Include it. 6 * menu.c: Include it.
5 * xmenu.c: Likewise. 7 * xmenu.c: Likewise.
diff --git a/src/lisp.h b/src/lisp.h
index 25a5729237d..86c5cac319c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -163,7 +163,7 @@ extern void die P_((const char *, const char *, int)) NO_RETURN;
163/* We also need to be able to specify mult-of-8 alignment on static vars. */ 163/* We also need to be able to specify mult-of-8 alignment on static vars. */
164# if defined DECL_ALIGN 164# if defined DECL_ALIGN
165/* We currently do not support USE_LSB_TAG with a union Lisp_Object. */ 165/* We currently do not support USE_LSB_TAG with a union Lisp_Object. */
166# if defined USE_LISP_UNION_TYPE 166# ifndef USE_LISP_UNION_TYPE
167# define USE_LSB_TAG 167# define USE_LSB_TAG
168# endif 168# endif
169# endif 169# endif