diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-09-17 22:34:45 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-09-17 22:34:45 +0000 |
| commit | 22aa38a0a8371ee1088ea16f98767e2732fed203 (patch) | |
| tree | a15b7ba168277b83e17ff01c0eef3caded47ba0f | |
| parent | dad33637073ad09e3268ae1bbc1a0968bd649e48 (diff) | |
| download | cygnal-22aa38a0a8371ee1088ea16f98767e2732fed203.tar.gz cygnal-22aa38a0a8371ee1088ea16f98767e2732fed203.tar.bz2 cygnal-22aa38a0a8371ee1088ea16f98767e2732fed203.zip | |
* byteorder.h: Don't #define n* macros if -fnoinline is specified.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/include/asm/byteorder.h | 2 |
2 files changed, 5 insertions, 1 deletions
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 <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 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)) : \ |