Changeset 85d7b85 for sock.h


Ignore:
Timestamp:
2008-04-02T14:22:57Z (16 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
f9dbc99
Parents:
875ad42 (diff), dd34575 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sock.h

    r875ad42 r85d7b85  
    11#include <errno.h>
    22#include <fcntl.h>
    3 
    4 /* To cut down on the ifdef stuff a little bit in other places */
    5 #ifdef IPV6
    6 #define AF_INETx AF_INET6
    7 #else
    8 #define AF_INETx AF_INET
    9 #endif
    103
    114#ifndef _WIN32
    … …  
    1811#define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
    1912#define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
     13#ifndef EVENTS_LIBEVENT
    2014#define closesocket(a) close(a)
     15#endif
    2116#else
    2217# include <winsock2.h>
Note: See TracChangeset for help on using the changeset viewer.