Changeset ebb95b6 for lib/misc.c

Timestamp:

2007-11-14T23:42:07Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

50e1776

Parents:

a6df0b5 (diff), 1bf1ae6 (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 devel/Jelmer.

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -322 +322 @@
 }
 
-#ifdef IPV6
 /* Wrap an IPv4 address into IPv6 space. Not thread-safe... */
 char *ipv6_wrap( char *src )
@@ -360 +359 @@
         return ( src + 7 );
 }
-#endif
 
 /* Convert from one charset to another.