Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7392 for code


Ignore:
Timestamp:
Sep 9, 2010, 6:00:00 PM (14 years ago)
Author:
adrfried
Message:

fix bugs

Location:
code/branches/ipv6/src/external/enet
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ipv6/src/external/enet/include/enet/enet.h

    r7391 r7392  
    5959} ENetHostAddress;
    6060
    61 extern ENET_API const ENetHostAddress ENET_HOST_ANY;          /**< specifies the default server host */
    62 extern ENET_API const ENetHostAddress ENET_IPV4MAPPED_PREFIX; /**< specifies the IPv4-mapped IPv6 prefix */
    63 extern ENET_API const ENetHostAddress ENET_HOST_BROADCAST;    /**< specifies a IPv4 subnet-wide broadcast */
    64 #define ENET_IPV4MAPPED_PREFIX_LEN 12                /**< specifies the length of the IPv4-mapped IPv6 prefix */
    65 #define ENET_PORT_ANY 0                              /**< specifies that a port should be automatically chosen */
     61ENET_API const ENetHostAddress ENET_HOST_ANY;          /**< specifies the default server host */
     62ENET_API const ENetHostAddress ENET_IPV4MAPPED_PREFIX; /**< specifies the IPv4-mapped IPv6 prefix */
     63ENET_API const ENetHostAddress ENET_HOST_BROADCAST;    /**< specifies a IPv4 subnet-wide broadcast */
     64#define ENET_IPV4MAPPED_PREFIX_LEN 12                  /**< specifies the length of the IPv4-mapped IPv6 prefix */
     65#define ENET_PORT_ANY 0                                /**< specifies that a port should be automatically chosen */
    6666
    6767/**
  • code/branches/ipv6/src/external/enet/win32.c

    r7391 r7392  
    8080    {
    8181        address -> host = enet_address_map4 ((((SOCKADDR_IN *) sin) -> sin_addr.s_addr));
    82         //address -> scopeID = 0;
     82        /* address -> scopeID = 0; */
    8383        address -> port = ENET_NET_TO_HOST_16 (((SOCKADDR_IN *) sin) -> sin_port);
    8484        return ENET_IPV4;
     
    200200enet_socket_create (ENetSocketType type, ENetAddressFamily family)
    201201{
    202     return socket (PF_INET, type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
     202    return socket (enet_af (family), type == ENET_SOCKET_TYPE_DATAGRAM ? SOCK_DGRAM : SOCK_STREAM, 0);
    203203}
    204204
Note: See TracChangeset for help on using the changeset viewer.