Changeset 6912


Ignore:
Timestamp:
Oct 15, 2008, 7:52:15 PM (13 years ago)
Author:
charles
Message:

(libT) apply some changes from Spry's code

Location:
trunk/libtransmission
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/JSON_parser.c

    r6795 r6912  
    188188};
    189189
     190// Temporary fix for Win32 target
     191#if defined(WIN32) && defined(_WIN32) && defined(IN)
     192#undef IN
     193#endif
    190194
    191195/*
  • trunk/libtransmission/inout.c

    r6905 r6912  
    3737#ifdef WIN32
    3838 #define lseek _lseeki64
    39  #ifdef read
    40    #undef read
     39 #if defined(read)
     40    #undef read
    4141 #endif
    4242 #define read  _read
    43  #ifdef write
    44    #undef write
     43 
     44 #if defined(write)
     45    #undef write
    4546 #endif
    4647 #define write _write
  • trunk/libtransmission/trevent.c

    r6907 r6912  
    9797 
    9898#define pipe(a) pgpipe(a)
    99 #define pipewrite(a,b,c) send(a,b,c,0)
     99#define pipewrite(a,b,c) send(a,(char*)b,c,0)
    100100
    101101#else
     
    270270    handle->events->die = TRUE;
    271271    tr_deepLog( __FILE__, __LINE__, NULL, "closing trevent pipe" );
    272     close( handle->events->fds[1] );
     272    EVUTIL_CLOSESOCKET( handle->events->fds[1] );
    273273}
    274274
Note: See TracChangeset for help on using the changeset viewer.