Author: metze Date: 2007-10-10 12:09:06 +0000 (Wed, 10 Oct 2007) New Revision: 25602
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25602 Log: don't imply "system/network.h" within replace.h, as this brings in the socket_wrapper.h in unexpected code and we endup with a missing 'swrap_close' while linking metze Modified: branches/SAMBA_4_0/source/lib/replace/replace.h branches/SAMBA_4_0/source/lib/replace/system/network.h Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/replace.h =================================================================== --- branches/SAMBA_4_0/source/lib/replace/replace.h 2007-10-10 11:57:16 UTC (rev 25601) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2007-10-10 12:09:06 UTC (rev 25602) @@ -325,15 +325,19 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); #endif +#ifdef REPLACE_INET_NTOA +#define inet_ntoa rep_inet_ntoa +/* prototype is in "system/network.h" */ +#endif + #ifndef HAVE_INET_PTON -int rep_inet_pton(int af, const char *src, void *dst); #define inet_pton rep_inet_pton +/* prototype is in "system/network.h" */ #endif #ifndef HAVE_INET_NTOP -#include "system/network.h" -const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); #define inet_ntop rep_inet_ntop +/* prototype is in "system/network.h" */ #endif #ifdef HAVE_LIMITS_H Modified: branches/SAMBA_4_0/source/lib/replace/system/network.h =================================================================== --- branches/SAMBA_4_0/source/lib/replace/system/network.h 2007-10-10 11:57:16 UTC (rev 25601) +++ branches/SAMBA_4_0/source/lib/replace/system/network.h 2007-10-10 12:09:06 UTC (rev 25602) @@ -90,10 +90,20 @@ #endif #ifdef REPLACE_INET_NTOA +/* define is in "replace.h" */ char *rep_inet_ntoa(struct in_addr ip); -#define inet_ntoa rep_inet_ntoa #endif +#ifndef HAVE_INET_PTON +/* define is in "replace.h" */ +int rep_inet_pton(int af, const char *src, void *dst); +#endif + +#ifndef HAVE_INET_NTOP +/* define is in "replace.h" */ +const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); +#endif + /* * glibc on linux doesn't seem to have MSG_WAITALL * defined. I think the kernel has it though..
