aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-11-13 14:20:01 -0800
committerDan Nicolaescu2010-11-13 14:20:01 -0800
commitc865c57571e31830bf6a3cd452461599892dec64 (patch)
treeff07600a7248d0d576ef0d85104f9db7946a3be6 /src
parentff2e8052fda9c0710e0b9088080e6e351c02e338 (diff)
downloademacs-c865c57571e31830bf6a3cd452461599892dec64.tar.gz
emacs-c865c57571e31830bf6a3cd452461599892dec64.zip
* src/xmenu.c: Make it clear that ../lwlib/lwlib.h is only needed for Motif.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xmenu.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 26a6c4c5b83..98054e08d45 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,8 @@
12010-11-13 Dan Nicolaescu <dann@ics.uci.edu> 12010-11-13 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 Fix compilation on Solaris. 3 * xmenu.c: Make it clear that ../lwlib/lwlib.h is only needed for Motif.
4 4
5 Fix compilation on Solaris.
5 * sysdep.c: Do not #include <term.h>. 6 * sysdep.c: Do not #include <term.h>.
6 (tputs): Add declaration, similar to what cm.c does. (Bug#7178) 7 (tputs): Add declaration, similar to what cm.c does. (Bug#7178)
7 8
diff --git a/src/xmenu.c b/src/xmenu.c
index 44f1721d65e..e8be9c6ad4c 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -89,7 +89,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
89#include <X11/Xaw/Paned.h> 89#include <X11/Xaw/Paned.h>
90#endif /* HAVE_XAW3D */ 90#endif /* HAVE_XAW3D */
91#endif /* USE_LUCID */ 91#endif /* USE_LUCID */
92#ifdef USE_MOTIF
92#include "../lwlib/lwlib.h" 93#include "../lwlib/lwlib.h"
94#endif
93#else /* not USE_X_TOOLKIT */ 95#else /* not USE_X_TOOLKIT */
94#ifndef USE_GTK 96#ifndef USE_GTK
95#include "../oldXMenu/XMenu.h" 97#include "../oldXMenu/XMenu.h"
@@ -2581,5 +2583,3 @@ syms_of_xmenu (void)
2581#endif 2583#endif
2582} 2584}
2583 2585
2584/* arch-tag: 92ea573c-398e-496e-ac73-2436f7d63242
2585 (do not change this comment) */