Mercurial > emacs
changeset 110735:4dfed46bce9a
* configure.in (NO_INLINE, noinline): Move here from src/xterm.c.
* src/xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 03 Oct 2010 08:39:21 -0700 |
| parents | 72f46bad930c |
| children | e66d3e54e4af |
| files | ChangeLog configure.in src/ChangeLog src/config.in src/xterm.c |
| diffstat | 5 files changed, 28 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Oct 03 08:19:34 2010 -0700 +++ b/ChangeLog Sun Oct 03 08:39:21 2010 -0700 @@ -1,3 +1,7 @@ +2010-10-03 Dan Nicolaescu <dann@ics.uci.edu> + + * configure.in (NO_INLINE, noinline): Move here from src/xterm.c. + 2010-10-01 Dan Nicolaescu <dann@ics.uci.edu> * configure.in: Include stdlib.h and string.h unconditionally.
--- a/configure.in Sun Oct 03 08:19:34 2010 -0700 +++ b/configure.in Sun Oct 03 08:39:21 2010 -0700 @@ -3643,6 +3643,17 @@ #define NO_RETURN /* nothing */ #endif +#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ +#define NO_INLINE __attribute__((noinline)) +#else +#define NO_INLINE +#endif + +/* Some versions of GNU/Linux define noinline in their headers. */ +#ifdef noinline +#undef noinline +#endif + /* These won't be used automatically yet. We also need to know, at least, that the stack is continuous. */ #ifdef __GNUC__
--- a/src/ChangeLog Sun Oct 03 08:19:34 2010 -0700 +++ b/src/ChangeLog Sun Oct 03 08:39:21 2010 -0700 @@ -1,5 +1,7 @@ 2010-10-03 Dan Nicolaescu <dann@ics.uci.edu> + * xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in. + Include <fcntl.h> unconditionally. * termcap.c: * sysdep.c:
--- a/src/config.in Sun Oct 03 08:19:34 2010 -0700 +++ b/src/config.in Sun Oct 03 08:39:21 2010 -0700 @@ -1206,6 +1206,17 @@ #define NO_RETURN /* nothing */ #endif +#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ +#define NO_INLINE __attribute__((noinline)) +#else +#define NO_INLINE +#endif + +/* Some versions of GNU/Linux define noinline in their headers. */ +#ifdef noinline +#undef noinline +#endif + /* These won't be used automatically yet. We also need to know, at least, that the stack is continuous. */ #ifdef __GNUC__
--- a/src/xterm.c Sun Oct 03 08:19:34 2010 -0700 +++ b/src/xterm.c Sun Oct 03 08:39:21 2010 -0700 @@ -7729,18 +7729,6 @@ /* .gdbinit puts a breakpoint here, so make sure it is not inlined. */ -#if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ -#define NO_INLINE __attribute__((noinline)) -#else -#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. */