diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-04-04 15:49:05 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-04-04 15:49:05 +0000 |
| commit | 4fedce119c521a4bdb816457f76bf4c90244aeb6 (patch) | |
| tree | 1848db550ea09c70a657cabe1dd190d13d78e58a | |
| parent | 56c5c08a5dc6c3846f4e799ba3c9c32fa69c64e3 (diff) | |
| download | cygnal-4fedce119c521a4bdb816457f76bf4c90244aeb6.tar.gz cygnal-4fedce119c521a4bdb816457f76bf4c90244aeb6.tar.bz2 cygnal-4fedce119c521a4bdb816457f76bf4c90244aeb6.zip | |
* include/asm/byteorder.h (__ntohl): Prototype before define to avoid
a warning with -Wmissing-prototypes. Use _ELIDABLE_INLINE macro from
_ansi.h.
(__ntohs): Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/include/asm/byteorder.h | 14 |
2 files changed, 14 insertions, 8 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index c901d09c2..f3f77e566 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2009-04-04 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> + Corinna Vinschen <corinna@vinschen.de> + + * include/asm/byteorder.h (__ntohl): Prototype before define to avoid + a warning with -Wmissing-prototypes. Use _ELIDABLE_INLINE macro from + _ansi.h. + (__ntohs): Ditto. + 2009-04-02 Corinna Vinschen <corinna@vinschen.de> * environ.cc (build_env): Fix length calculation of resulting diff --git a/winsup/cygwin/include/asm/byteorder.h b/winsup/cygwin/include/asm/byteorder.h index 8e9fbaa11..3727c5421 100644 --- a/winsup/cygwin/include/asm/byteorder.h +++ b/winsup/cygwin/include/asm/byteorder.h @@ -11,6 +11,7 @@ details. */ #ifndef _I386_BYTEORDER_H #define _I386_BYTEORDER_H +#include <_ansi.h> #include <stdint.h> #ifdef __cplusplus @@ -30,10 +31,10 @@ extern uint16_t ntohs(uint16_t); extern uint32_t htonl(uint32_t); extern uint16_t htons(uint16_t); -#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) -extern -#endif -__inline__ uint32_t +_ELIDABLE_INLINE uint32_t __ntohl(uint32_t); +_ELIDABLE_INLINE uint16_t __ntohs(uint16_t); + +_ELIDABLE_INLINE uint32_t __ntohl(uint32_t x) { __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */ @@ -50,10 +51,7 @@ __ntohl(uint32_t x) (((uint32_t)(x) & 0x00ff0000U) >> 8) | \ (((uint32_t)(x) & 0xff000000U) >> 24))) -#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) -extern -#endif -__inline__ uint16_t +_ELIDABLE_INLINE uint16_t __ntohs(uint16_t x) { __asm__("xchgb %b0,%h0" /* swap bytes */ |