Changeset 6181


Ignore:
Timestamp:
Jun 13, 2008, 9:08:16 PM (13 years ago)
Author:
charles
Message:

#972: "Transmission fails to compile with Sun Studio due to funky C code" backported to 1.2x

Location:
branches/1.2x
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2x/gtk/main.c

    r5761 r6181  
    619619}
    620620
     621#if 0
    621622/* since there are no buttons in the dialog, gtk tries to
    622623 * select one of the labels, which looks ugly... so force
     
    630631        gtk_container_foreach( GTK_CONTAINER(w), deselectLabels, NULL );
    631632}
     633#endif
    632634
    633635static void
  • branches/1.2x/libtransmission/natpmp.c

    r5620 r6181  
    127127        logVal( "readnatpmpresponseorretry", val );
    128128        if( val >= 0 ) {
    129             tr_ninf( getKey(), _( "Found public address \"%s\"" ), inet_ntoa( response.publicaddress.addr ) );
     129            tr_ninf( getKey(), _( "Found public address \"%s\"" ), inet_ntoa( response.pnu.publicaddress.addr ) );
    130130            nat->state = TR_NATPMP_IDLE;
    131131        } else if( val != NATPMP_TRYAGAIN ) {
     
    189189            nat->isMapped = 1;
    190190            nat->renewTime = time( NULL ) + LIFETIME_SECS;
    191             nat->port = resp.newportmapping.privateport;
     191            nat->port = resp.pnu.newportmapping.privateport;
    192192            tr_ninf( getKey(), _( "Port %d forwarded successfully" ), nat->port );
    193193        } else if( val != NATPMP_TRYAGAIN ) {
  • branches/1.2x/libtransmission/torrent.c

    r5781 r6181  
    843843void tr_torrentAvailability( const tr_torrent * tor, int8_t * tab, int size )
    844844{
    845     return tr_peerMgrTorrentAvailability( tor->handle->peerMgr,
    846                                           tor->info.hash,
    847                                           tab, size );
     845    tr_peerMgrTorrentAvailability( tor->handle->peerMgr,
     846                                   tor->info.hash,
     847                                   tab, size );
    848848}
    849849
  • branches/1.2x/third-party/libnatpmp/README

    r5743 r6181  
    11libnatpmp is written by Thomas Bernard.
    22Its homepage is http://miniupnp.tuxfamily.org/libnatpmp.html
    3 This code is from the libnatpmp-20080428 snapshot
     3This code is from the libnatpmp-20080529 snapshot
    44
  • branches/1.2x/third-party/libnatpmp/natpmp.c

    r5743 r6181  
    1 /* $Id: natpmp.c,v 1.6 2008/04/28 02:58:34 nanard Exp $ */
     1/* $Id: natpmp.c,v 1.7 2008/05/29 08:06:01 nanard Exp $ */
    22/* libnatpmp
    33 * Copyright (c) 2007-2008, Thomas BERNARD <miniupnp@free.fr>
     
    204204                        if(buf[1] == 128)
    205205                                //response->publicaddress.addr = *((uint32_t *)(buf + 8));
    206                                 response->publicaddress.addr.s_addr = *((uint32_t *)(buf + 8));
     206                                response->pnu.publicaddress.addr.s_addr = *((uint32_t *)(buf + 8));
    207207                        else {
    208                                 response->newportmapping.privateport = ntohs(*((uint16_t *)(buf + 8)));
    209                                 response->newportmapping.mappedpublicport = ntohs(*((uint16_t *)(buf + 10)));
    210                                 response->newportmapping.lifetime = ntohl(*((uint32_t *)(buf + 12)));
     208                                response->pnu.newportmapping.privateport = ntohs(*((uint16_t *)(buf + 8)));
     209                                response->pnu.newportmapping.mappedpublicport = ntohs(*((uint16_t *)(buf + 10)));
     210                                response->pnu.newportmapping.lifetime = ntohl(*((uint32_t *)(buf + 12)));
    211211                        }
    212212                        n = 0;
  • branches/1.2x/third-party/libnatpmp/natpmp.h

    r5743 r6181  
    1 /* $Id: natpmp.h,v 1.8 2008/04/28 02:58:34 nanard Exp $ */
     1/* $Id: natpmp.h,v 1.9 2008/05/29 08:06:01 nanard Exp $ */
    22/* libnatpmp
    33 * Copyright (c) 2007-2008, Thomas BERNARD <miniupnp@free.fr>
     
    5353                        uint32_t lifetime;
    5454                } newportmapping;
    55         };
     55        } pnu;
    5656} natpmpresp_t;
    5757
Note: See TracChangeset for help on using the changeset viewer.