Ignore:
Timestamp:
Sep 20, 2007, 4:32:01 PM (15 years ago)
Author:
livings124
Message:

merge encryption branch to trunk (xcode project is still out of date)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/fdlimit.c

    r2596 r3105  
    6464typedef struct tr_fd_s
    6565{
    66     tr_lock_t     * lock;
    67     tr_cond_t     * cond;
     66    tr_lock       * lock;
     67    tr_cond       * cond;
    6868   
    6969    int             reserved;
     
    391391void tr_fdSocketClose( int s )
    392392{
    393     tr_lockLock( gFd->lock );
     393    if( s >= 0 )
     394    {
     395        tr_lockLock( gFd->lock );
    394396#ifdef BEOS_NETSERVER
    395     closesocket( s );
     397        closesocket( s );
    396398#else
    397     close( s );
     399        close( s );
    398400#endif
    399     if( SocketGetPriority( s ) )
    400         gFd->reserved--;
    401     else
    402         gFd->normal--;
    403     tr_lockUnlock( gFd->lock );
     401        if( SocketGetPriority( s ) )
     402            gFd->reserved--;
     403        else
     404            gFd->normal--;
     405        tr_lockUnlock( gFd->lock );
     406    }
    404407}
    405408
Note: See TracChangeset for help on using the changeset viewer.