Ignore:
Timestamp:
Sep 25, 2006, 6:37:45 PM (15 years ago)
Author:
joshe
Message:

Merge nat-traversal branch to trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/internal.h

    r788 r920  
    2929   That is probably ugly to put them all here, but it is sooo
    3030   convenient */
     31#if ( defined( __unix__ ) || defined( unix ) ) && !defined( USG )
     32#include <sys/param.h>
     33#endif
    3134#include <stdio.h>
    3235#include <stdarg.h>
     
    5154#ifdef BEOS_NETSERVER
    5255#  define in_port_t uint16_t
     56#  define socklen_t uint32_t
    5357#else
    5458#  include <arpa/inet.h>
    5559#endif
    5660
     61#ifndef INADDR_NONE
     62#define INADDR_NONE             0xffffffff
     63#endif
     64
    5765#ifdef __GNUC__
    5866#  define UNUSED __attribute__((unused))
     67#  define PRINTF( fmt, args ) __attribute__((format (printf, fmt, args)))
    5968#else
    6069#  define UNUSED
     70#  define PRINTF( fmt, args )
    6171#endif
    6272
     
    108118typedef struct tr_completion_s tr_completion_t;
    109119
     120typedef enum { TR_OK, TR_ERROR, TR_WAIT } tr_tristate_t;
     121
    110122#include "platform.h"
    111123#include "bencode.h"
     
    119131#include "clients.h"
    120132#include "choking.h"
     133#include "natpmp.h"
     134#include "upnp.h"
     135#include "http.h"
     136#include "xml.h"
    121137
    122138struct tr_torrent_s
     
    188204    tr_fd_t      * fdlimit;
    189205    tr_choking_t * choking;
     206    tr_natpmp_t  * natpmp;
     207    tr_upnp_t    * upnp;
    190208
    191209    int            bindPort;
Note: See TracChangeset for help on using the changeset viewer.