* configure.in (NO_INLINE, noinline): Move here from src/xterm.c.

* src/xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in.

5 files changed, 28 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index c3bb32c2ade..fc541930c4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/configure.in b/configure.in
index e52bb2bd22e..7b9677f27c1 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 c535c2fc64a..0ed868b7d3a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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:
diff --git a/src/config.in b/src/config.in
index d5eaada59bb..a09ebeabcec 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 f9dd21c87fe..abeb7712bc8 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.  */