The branch, v3-2-test has been updated via 0177158d85797e0d22c81d88175a77d4ad5ed711 (commit) via ec8e3f7f92522c65ec472058321db8a7ac30ec4c (commit) from 29eb4d0e2d8ce4a0bd2a081265417684c8c69d6d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 0177158d85797e0d22c81d88175a77d4ad5ed711 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Mon Oct 15 10:59:50 2007 +0200 missing stuff from samba4's libreplace metze commit ec8e3f7f92522c65ec472058321db8a7ac30ec4c Author: metze <[EMAIL PROTECTED]> Date: Wed Oct 10 12:09:06 2007 +0000 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 git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818 ----------------------------------------------------------------------- Summary of changes: source/lib/replace/replace.h | 11 +++++++---- source/lib/replace/system/network.h | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h index 3dc10db..e42d5ff 100644 --- a/source/lib/replace/replace.h +++ b/source/lib/replace/replace.h @@ -97,7 +97,6 @@ void *rep_memmove(void *dest,const void *src,int size); #endif #ifndef HAVE_TIMEGM -struct tm; #define timegm rep_timegm /* prototype is in "system/time.h" */ #endif @@ -326,15 +325,19 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); 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 diff --git a/source/lib/replace/system/network.h b/source/lib/replace/system/network.h index c2a5dec..0b0dbcb 100644 --- a/source/lib/replace/system/network.h +++ b/source/lib/replace/system/network.h @@ -49,6 +49,10 @@ #include <netinet/tcp.h> #endif +#if !defined(HAVE_GETADDRINFO) +#include "getaddrinfo.h" +#endif + /* * The next three defines are needed to access the IPTOS_* options * on some systems. @@ -86,8 +90,18 @@ #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 /* -- Samba Shared Repository