Changeset 2231302 for lib/misc.c


Ignore:
Timestamp:
2007-11-05T22:59:49Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
be68d99
Parents:
5e2615a (diff), 7435ccf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging from Jelmer.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/misc.c

    r5e2615a r2231302  
    322322}
    323323
    324 #ifdef IPV6
    325324/* Wrap an IPv4 address into IPv6 space. Not thread-safe... */
    326325char *ipv6_wrap( char *src )
     
    360359        return ( src + 7 );
    361360}
    362 #endif
    363361
    364362/* Convert from one charset to another.
Note: See TracChangeset for help on using the changeset viewer.