From 22aa38a0a8371ee1088ea16f98767e2732fed203 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 17 Sep 2006 22:34:45 +0000 Subject: [PATCH] * byteorder.h: Don't #define n* macros if -fnoinline is specified. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/include/asm/byteorder.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index bdf457235..8e650cd6c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2006-09-17 Danny Smith + + * byteorder.h: Don't #define n* macros if -fnoinline is specified. + 2006-09-07 Christopher Faylor * 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 79e580fde..ce45e5485 100644 --- 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)) : \