* byteorder.h: Don't #define n* macros if -fnoinline is specified.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bdf4572..8e650cd 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-17  Danny Smith  <dannysmith@clear.net.nz>
+
+       * byteorder.h: Don't #define n* macros if -fnoinline is specified.
+
 2006-09-07  Christopher Faylor  <cgf@timesys.com>
 
        * environ.cc (build_env): Don't put an empty environment variable into

diff --git a/winsup/cygwin/include/asm/byteorder.h b/winsup/cygwin/include/asm/byteorder.h
index 79e580f..ce45e54 100644 (file)
--- a/winsup/cygwin/include/asm/byteorder.h
+++ b/winsup/cygwin/include/asm/byteorder.h
@@ -70,7 +70,7 @@ __ntohs(uint16_t x)
 #define __constant_htonl(x) __constant_ntohl(x)
 #define __constant_htons(x) __constant_ntohs(x)
 
-#ifdef  __OPTIMIZE__
+#if defined (__OPTIMIZE__) && !defined (__NO_NOINLINE__)
 #  define ntohl(x) \
 (__builtin_constant_p((long)(x)) ? \
  __constant_ntohl((x)) : \