Mercurial > emacs
diff src/xterm.c @ 83304:6fef25c75847
Merged from miles@gnu.org--gnu-2005 (patch 296-306)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-296
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-297
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-298
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-299
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-300
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-301
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-302
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-303
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-304
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-305
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-306
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-344
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Fri, 13 May 2005 22:59:23 +0000 |
| parents | 360860a0006f 52a6e4267841 |
| children | 63b7247f4be6 |
line wrap: on
line diff
--- a/src/xterm.c Mon May 09 16:17:25 2005 +0000 +++ b/src/xterm.c Fri May 13 22:59:23 2005 +0000 @@ -7794,6 +7794,12 @@ #define NO_INLINE #endif +/* Some versions of GNU/Linux define noinline in their headers. */ + +#ifdef noinline +#undef noinline +#endif + /* On older GCC versions, just putting x_error_quitter after x_error_handler prevents inlining into the former. */