Ignore:
Timestamp:
Aug 10, 2010, 7:31:37 PM (15 years ago)
Author:
dmik
Message:

winsock2.h: Removed duplicate GROUP definition.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/win/winsock2.h

    r8372 r21409  
    44 * FIXME: Still missing required Winsock 2 definitions.
    55 */
    6  
     6
    77#ifndef __WINSOCK2API__
    88#define __WINSOCK2API__
     
    9191
    9292/* Unfortunately the sockaddr_in6 structure doesn't
    93    seem to be defined in a standard place, even across 
     93   seem to be defined in a standard place, even across
    9494   different Linux distributions.  Until IPv6 support settles
    95    down, let's do our own here so the sockaddr_gen 
     95   down, let's do our own here so the sockaddr_gen
    9696   union is the correct size.*/
    9797#ifdef s6_addr
     
    184184} INTERFACE_INFO, * LPINTERFACE_INFO;
    185185
    186 /* Possible flags for the  iiFlags - bitmask  */ 
     186/* Possible flags for the  iiFlags - bitmask  */
    187187#ifndef HAVE_NET_IF_H
    188188#  define IFF_UP                0x00000001 /* Interface is up */
     
    201201#define LAYERED_PROTOCOL   0
    202202
    203 typedef struct _WSAPROTOCOLCHAIN 
     203typedef struct _WSAPROTOCOLCHAIN
    204204{
    205205    int ChainLen;                                 /* the length of the chain,     */
     
    211211#define WSAPROTOCOL_LEN  255
    212212
    213 typedef struct _WSAPROTOCOL_INFOA 
     213typedef struct _WSAPROTOCOL_INFOA
    214214{
    215215    DWORD dwServiceFlags1;
     
    259259} WSAPROTOCOL_INFOW, * LPWSAPROTOCOL_INFOW;
    260260
    261 typedef struct _WSANETWORKEVENTS 
     261typedef struct _WSANETWORKEVENTS
    262262{
    263263  long lNetworkEvents;
     
    265265} WSANETWORKEVENTS, *LPWSANETWORKEVENTS;
    266266
    267 typedef struct _WSABUF 
     267typedef struct _WSABUF
    268268{
    269269    ULONG len;
     
    273273typedef struct _OVERLAPPED *  LPWSAOVERLAPPED;
    274274typedef HANDLE WSAEVENT;
    275 typedef unsigned int   GROUP;
    276275
    277276#define WSA_IO_PENDING             (ERROR_IO_PENDING)
     
    314313        FLOWSPEC           SendingFlowspec;
    315314        FLOWSPEC           ReceivingFlowspec;
    316         WSABUF             ProviderSpecific; 
     315        WSABUF             ProviderSpecific;
    317316   } QOS, *LPQOS;
    318317
Note: See TracChangeset for help on using the changeset viewer.