Changeset 2593


Ignore:
Timestamp:
Aug 2, 2007, 9:58:34 PM (15 years ago)
Author:
charles
Message:

more portability fixes

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/transmissioncli.c

    r2444 r2593  
    3434
    3535#ifdef SYS_BEOS
    36 #include <kernel/OS.h>
    37 #define usleep snooze
     36    #include <kernel/OS.h>
     37    #define usleep snooze
     38#elif defined(WIN32)
     39    #include <windows.h>
     40    #define usleep(N) Sleep(N/1000)
    3841#endif
    3942
     
    247250        int result;
    248251
    249         sleep( 1 );
     252        usleep( 1000 );
    250253
    251254        if( gotsig )
  • trunk/libtransmission/fdlimit.c

    r2591 r2593  
    341341    if( priority || ( gFd->normal < gFd->normalMax ) )
    342342       if( ( s = socket( AF_INET, type, 0 ) ) < 0 )
    343            tr_err( "Could not create socket (%s)", strerror( sockerrno ) );
     343           tr_err( "Couldn't create socket (%s)", strerror( sockerrno ) );
    344344
    345345    if( s > -1 )
     
    457457                {
    458458                    ret = tr_ioErrorFromErrno();
    459                     tr_err( "Could not create folder '%s'", path );
     459                    tr_err( "Couldn't create folder '%s'", path );
    460460                    return ret;
    461461                }
  • trunk/libtransmission/net.c

    r2591 r2593  
    271271#endif
    272272    {
    273         tr_err( "Could not set socket to non-blocking mode (%s)",
     273        tr_err( "Couldn't set socket to non-blocking mode (%s)",
    274274                strerror( sockerrno ) );
    275275        tr_netClose( s );
     
    311311        sockerrno != EINPROGRESS )
    312312    {
    313         tr_err( "Could not connect socket (%s)", strerror( sockerrno ) );
     313        tr_err( "Couldn't connect socket (%s)", strerror( sockerrno ) );
    314314        tr_netClose( s );
    315315        return -1;
     
    348348    if( setsockopt( fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&req, sizeof ( req ) ) )
    349349    {
    350         tr_err( "Could not join multicast group (%s)", strerror( sockerrno ) );
     350        tr_err( "Couldn't join multicast group (%s)", strerror( sockerrno ) );
    351351        tr_netClose( fd );
    352352        return -1;
     
    397397               sizeof( struct sockaddr_in ) ) )
    398398    {
    399         tr_err( "Could not bind port %d", port );
     399        tr_err( "Couldn't bind port %d", port );
    400400        tr_netClose( s );
    401401        return -1;
  • trunk/wx/torrent-list.cc

    r2523 r2593  
    370370static TorrentListCtrl * uglyHack = NULL;
    371371
    372 int
     372int wxCALLBACK
    373373TorrentListCtrl :: Compare( long item1, long item2, long sortData )
    374374{
  • trunk/wx/torrent-list.h

    r2519 r2593  
    8888        void RefreshTorrent( tr_torrent_t*, int, const std::vector<int>& );
    8989        void Remove( const std::set<tr_torrent_t*>& );
    90         static int Compare( long, long, long );
     90        static int wxCALLBACK Compare( long, long, long );
    9191
    9292        /** torrent hash -> the torrent's row in myTorrentList */
Note: See TracChangeset for help on using the changeset viewer.