include: Fix a couple of winsock structures for 64-bit.

This commit is contained in:
Alexandre Julliard 2009-01-02 12:20:33 +01:00
parent 253ccfbb99
commit 3b22148532
1 changed files with 13 additions and 6 deletions

View File

@ -144,9 +144,6 @@ typedef unsigned int u_long;
extern "C" {
#endif /* defined(__cplusplus) */
/* proper 4-byte packing */
#include <pshpack4.h>
/*
* Address families
*/
@ -365,8 +362,13 @@ typedef struct WS(servent)
{
char* s_name; /* official service name */
char** s_aliases; /* alias list */
#ifdef _WIN64
char* s_proto; /* protocol to use */
short s_port; /* port # */
#else
short s_port; /* port # */
char* s_proto; /* protocol to use */
#endif
} SERVENT, *PSERVENT, *LPSERVENT;
@ -647,11 +649,19 @@ typedef struct WS(WSAData)
{
WORD wVersion;
WORD wHighVersion;
#ifdef _WIN64
WORD iMaxSockets;
WORD iMaxUdpDg;
char *lpVendorInfo;
char szDescription[WSADESCRIPTION_LEN+1];
char szSystemStatus[WSASYS_STATUS_LEN+1];
#else
char szDescription[WSADESCRIPTION_LEN+1];
char szSystemStatus[WSASYS_STATUS_LEN+1];
WORD iMaxSockets;
WORD iMaxUdpDg;
char *lpVendorInfo;
#endif
} WSADATA, *LPWSADATA;
@ -1051,9 +1061,6 @@ SOCKET WINAPI WS(socket)(int,int,int);
#endif /* !defined(__WINE_WINSOCK2__) || WS_API_PROTOTYPES */
#include <poppack.h>
#ifdef __cplusplus
}
#endif