diff options
| author | Dan Nicolaescu <[email protected]> | 2010-10-03 08:39:21 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2010-10-03 08:39:21 -0700 |
| commit | 4777478a50f6de9634d2d5b81ad2bac191d569b6 (patch) | |
| tree | 697546b453ef2da09dbf221df77ef4b0ab5aa11e | |
| parent | a3d5088daa2e78d9dc2d7eddc4ac9c56cfe11caa (diff) | |
* configure.in (NO_INLINE, noinline): Move here from src/xterm.c.
* src/xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/config.in | 11 | ||||
| -rw-r--r-- | src/xterm.c | 12 |
5 files changed, 28 insertions, 12 deletions
@@ -1,3 +1,7 @@ +2010-10-03 Dan Nicolaescu <[email protected]> + + * configure.in (NO_INLINE, noinline): Move here from src/xterm.c. + 2010-10-01 Dan Nicolaescu <[email protected]> * configure.in: Include stdlib.h and string.h unconditionally. diff --git a/configure.in b/configure.in index e52bb2bd22..7b9677f27c 100644 --- a/configure.in +++ b/configure.in @@ -3643,6 +3643,17 @@ typedef unsigned size_t; #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__ diff --git a/src/ChangeLog b/src/ChangeLog index c535c2fc64..0ed868b7d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-10-03 Dan Nicolaescu <[email protected]> + * xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in. + Include <fcntl.h> unconditionally. * termcap.c: * sysdep.c: diff --git a/src/config.in b/src/config.in index d5eaada59b..a09ebeabce 100644 --- a/src/config.in +++ b/src/config.in @@ -1206,6 +1206,17 @@ typedef unsigned size_t; #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__ diff --git a/src/xterm.c b/src/xterm.c index f9dd21c87f..abeb7712bc 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7729,18 +7729,6 @@ x_error_handler (Display *display, XErrorEvent *error) /* .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. */ |