ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Eliminate redundancy between winsock.h and inaddr.h.

This commit is contained in:
Francois Gouget 2011-12-09 11:58:22 +01:00 committed by Alexandre Julliard
parent c63496ac71
commit d20c21ddd5
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/inaddr.h
View File

@ -48,6 +48,13 @@ typedef struct WS(in_addr)
#define s_lh S_un.S_un_b.s_b3 #define s_lh S_un.S_un_b.s_b3
#define s_impno S_un.S_un_b.s_b4 #define s_impno S_un.S_un_b.s_b4
#define s_imp S_un.S_un_w.s_w2 #define s_imp S_un.S_un_w.s_w2
#else
#define WS_s_addr S_un.S_addr
#define WS_s_net S_un.S_un_b.s_b1
#define WS_s_host S_un.S_un_b.s_b2
#define WS_s_lh S_un.S_un_b.s_b3
#define WS_s_impno S_un.S_un_b.s_b4
#define WS_s_imp S_un.S_un_w.s_w2
#endif /* USE_WS_PREFIX */ #endif /* USE_WS_PREFIX */
#endif /* __INADDR_H__ */ #endif /* __INADDR_H__ */

30
include/winsock.h
View File

@ -116,6 +116,8 @@
#ifndef _WINSOCKAPI_ #ifndef _WINSOCKAPI_
#define _WINSOCKAPI_ #define _WINSOCKAPI_
#include <inaddr.h>
#ifdef USE_WS_PREFIX #ifdef USE_WS_PREFIX
typedef unsigned char WS_u_char; typedef unsigned char WS_u_char;
typedef unsigned short WS_u_short; typedef unsigned short WS_u_short;
@ -591,34 +593,6 @@ static inline ULONG __wine_ulong_swap(ULONG l)
#define WS_INADDR_NONE 0xffffffff #define WS_INADDR_NONE 0xffffffff
#endif /* USE_WS_PREFIX */ #endif /* USE_WS_PREFIX */
typedef struct WS(in_addr)
{
union {
struct {
WS(u_char) s_b1,s_b2,s_b3,s_b4;
} S_un_b;
struct {
WS(u_short) s_w1,s_w2;
} S_un_w;
ULONG S_addr;
} S_un;
#ifndef USE_WS_PREFIX
#define s_addr S_un.S_addr
#define s_host S_un.S_un_b.s_b2
#define s_net S_un.S_un_b.s_b1
#define s_imp S_un.S_un_w.s_w2
#define s_impno S_un.S_un_b.s_b4
#define s_lh S_un.S_un_b.s_b3
#else
#define WS_s_addr S_un.S_addr
#define WS_s_host S_un.S_un_b.s_b2
#define WS_s_net S_un.S_un_b.s_b1
#define WS_s_imp S_un.S_un_w.s_w2
#define WS_s_impno S_un.S_un_b.s_b4
#define WS_s_lh S_un.S_un_b.s_b3
#endif /* USE_WS_PREFIX */
} IN_ADDR, *PIN_ADDR, *LPIN_ADDR;
typedef struct WS(sockaddr_in) typedef struct WS(sockaddr_in)
{ {
short sin_family; short sin_family;