Mercurial > emacs
diff src/xmenu.c @ 90951:3619e7770f2e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 793-802)
- Update from CVS
- Remove RCS keywords
- Merge from emacs--rel--22
* emacs--rel--22 (patch 42-50)
- Update from CVS
- Merge from gnus--rel--5.10
- Gnus ChangeLog tweaks
* gnus--rel--5.10 (patch 229-232)
- Merge from emacs--devo--0, emacs--rel--22
- ChangeLog tweak
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-223
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 16 Jun 2007 22:32:13 +0000 |
| parents | e9f94688a064 a5376379eaae |
| children | 3371fc48749b |
line wrap: on
line diff
--- a/src/xmenu.c Sat Jun 16 21:50:56 2007 +0000 +++ b/src/xmenu.c Sat Jun 16 22:32:13 2007 +0000 @@ -82,7 +82,11 @@ #include <X11/StringDefs.h> #include <X11/Shell.h> #ifdef USE_LUCID +#ifdef HAVE_XAW3D +#include <X11/Xaw3d/Paned.h> +#else /* !HAVE_XAW3D */ #include <X11/Xaw/Paned.h> +#endif /* HAVE_XAW3D */ #endif /* USE_LUCID */ #include "../lwlib/lwlib.h" #else /* not USE_X_TOOLKIT */
