JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/asm/byteorder.h: Include stdint.h. Per standard, change

Browse Source 
datatypes in ntohX and htonX functions to uintXX_t types.
This commit is contained in:
Corinna Vinschen 2006-04-21 09:59:07 +00:00
parent 6fbcec60a8
commit 387e6a35d8
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-21 Corinna Vinschen <corinna@vinschen.de>
* include/asm/byteorder.h: Include stdint.h. Per standard, change
datatypes in ntohX and htonX functions to uintXX_t types.
2006-04-18 Christopher Faylor <cgf@timesys.com> 2006-04-18 Christopher Faylor <cgf@timesys.com>
* exceptions.cc (ctrl_c_handler): Only exit TRUE on CTRL_LOGOFF_EVENT * exceptions.cc (ctrl_c_handler): Only exit TRUE on CTRL_LOGOFF_EVENT

45
winsup/cygwin/include/asm/byteorder.h
View File

@ -11,17 +11,12 @@ details. */
#ifndef _I386_BYTEORDER_H #ifndef _I386_BYTEORDER_H
#define _I386_BYTEORDER_H #define _I386_BYTEORDER_H
#include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if 0
#undef ntohl
#undef ntohs
#undef htonl
#undef htons
#endif
#ifndef __LITTLE_ENDIAN #ifndef __LITTLE_ENDIAN
#define __LITTLE_ENDIAN 1234 #define __LITTLE_ENDIAN 1234
#endif #endif
@ -30,18 +25,17 @@ extern "C" {
#define __LITTLE_ENDIAN_BITFIELD #define __LITTLE_ENDIAN_BITFIELD
#endif #endif
#if 1 extern uint32_t ntohl(uint32_t);
extern unsigned long int ntohl(unsigned long int); extern uint16_t ntohs(uint16_t);
extern unsigned short int ntohs(unsigned short int); extern uint32_t htonl(uint32_t);
extern unsigned long int htonl(unsigned long int); extern uint16_t htons(uint16_t);
extern unsigned short int htons(unsigned short int);
extern __inline__ unsigned long int __ntohl(unsigned long int); extern __inline__ uint32_t __ntohl(uint32_t);
extern __inline__ unsigned short int __ntohs(unsigned short int); extern __inline__ uint16_t __ntohs(uint16_t);
extern __inline__ unsigned long int __constant_ntohl(unsigned long int); extern __inline__ uint32_t __constant_ntohl(uint32_t);
extern __inline__ unsigned short int __constant_ntohs(unsigned short int); extern __inline__ uint16_t __constant_ntohs(uint16_t);
extern __inline__ unsigned long int extern __inline__ uint32_t
__ntohl(unsigned long int x) __ntohl(unsigned long int x)
{ {
__asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */ __asm__("xchgb %b0,%h0\n\t" /* swap lower bytes */
@ -53,13 +47,13 @@ __ntohl(unsigned long int x)
} }
#define __constant_ntohl(x) \ #define __constant_ntohl(x) \
((unsigned long int)((((unsigned long int)(x) & 0x000000ffU) << 24) | \ ((uint32_t)((((uint32_t)(x) & 0x000000ffU) << 24) | \
(((unsigned long int)(x) & 0x0000ff00U) << 8) | \ (((uint32_t)(x) & 0x0000ff00U) << 8) | \
(((unsigned long int)(x) & 0x00ff0000U) >> 8) | \ (((uint32_t)(x) & 0x00ff0000U) >> 8) | \
(((unsigned long int)(x) & 0xff000000U) >> 24))) (((uint32_t)(x) & 0xff000000U) >> 24)))
extern __inline__ unsigned short int extern __inline__ uint16_t
__ntohs(unsigned short int x) __ntohs(uint16_t x)
{ {
__asm__("xchgb %b0,%h0" /* swap bytes */ __asm__("xchgb %b0,%h0" /* swap bytes */
: "=q" (x) : "=q" (x)
@ -68,8 +62,8 @@ __ntohs(unsigned short int x)
} }
#define __constant_ntohs(x) \ #define __constant_ntohs(x) \
((unsigned short int)((((unsigned short int)(x) & 0x00ff) << 8) | \ ((uint16_t)((((uint16_t)(x) & 0x00ff) << 8) | \
(((unsigned short int)(x) & 0xff00) >> 8))) \ (((uint16_t)(x) & 0xff00) >> 8))) \
#define __htonl(x) __ntohl(x) #define __htonl(x) __ntohl(x)
#define __htons(x) __ntohs(x) #define __htons(x) __ntohs(x)
@ -94,7 +88,6 @@ __ntohs(unsigned short int x)
__constant_htons((x)) : \ __constant_htons((x)) : \
__htons((x))) __htons((x)))
#endif #endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }