sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

don't imply "system/network.h" within replace.h,

Browse Source 
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/SAMBA_4_0@25602 0c0555d6-39d7-0310-84fc-f1cc0bd64818
(This used to be commit ec8e3f7f92)
This commit is contained in:
metze 2007-10-10 12:09:06 +00:00 committed by Stefan Metzmacher
parent d3a7f49c6f
commit 804396dce9
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/replace/replace.h
View File

@ -326,15 +326,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

12
source3/lib/replace/system/network.h
View File

@ -86,8 +86,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
/*