Changeset 21409 for trunk/include

Timestamp:

Aug 10, 2010, 7:31:37 PM (15 years ago)

Author:

dmik

Message:

winsock2.h: Removed duplicate GROUP definition.

File:

• trunk/include/win/winsock2.h (modified) (9 diffs)

trunk/include/win/winsock2.h

@@ -4 +4 @@
  * FIXME: Still missing required Winsock 2 definitions.
  */
- 
+
 #ifndef __WINSOCK2API__
 #define __WINSOCK2API__
@@ -91 +91 @@
 
 /* Unfortunately the sockaddr_in6 structure doesn't
-   seem to be defined in a standard place, even across 
+   seem to be defined in a standard place, even across
    different Linux distributions.  Until IPv6 support settles
-   down, let's do our own here so the sockaddr_gen 
+   down, let's do our own here so the sockaddr_gen
    union is the correct size.*/
 #ifdef s6_addr
@@ -184 +184 @@
 } INTERFACE_INFO, * LPINTERFACE_INFO;
 
-/* Possible flags for the  iiFlags - bitmask  */ 
+/* Possible flags for the  iiFlags - bitmask  */
 #ifndef HAVE_NET_IF_H
 #  define IFF_UP                0x00000001 /* Interface is up */
@@ -201 +201 @@
 #define LAYERED_PROTOCOL   0
 
-typedef struct _WSAPROTOCOLCHAIN 
+typedef struct _WSAPROTOCOLCHAIN
 {
     int ChainLen;                                 /* the length of the chain,     */
@@ -211 +211 @@
 #define WSAPROTOCOL_LEN  255
 
-typedef struct _WSAPROTOCOL_INFOA 
+typedef struct _WSAPROTOCOL_INFOA
 {
     DWORD dwServiceFlags1;
@@ -259 +259 @@
 } WSAPROTOCOL_INFOW, * LPWSAPROTOCOL_INFOW;
 
-typedef struct _WSANETWORKEVENTS 
+typedef struct _WSANETWORKEVENTS
 {
   long lNetworkEvents;
@@ -265 +265 @@
 } WSANETWORKEVENTS, *LPWSANETWORKEVENTS;
 
-typedef struct _WSABUF 
+typedef struct _WSABUF
 {
     ULONG len;
@@ -273 +273 @@
 typedef struct _OVERLAPPED *  LPWSAOVERLAPPED;
 typedef HANDLE WSAEVENT;
-typedef unsigned int   GROUP;
 
 #define WSA_IO_PENDING             (ERROR_IO_PENDING)
@@ -314 +313 @@
         FLOWSPEC           SendingFlowspec;
         FLOWSPEC           ReceivingFlowspec;
-        WSABUF             ProviderSpecific; 
+        WSABUF             ProviderSpecific;
    } QOS, *LPQOS;