diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 10:18:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 10:18:35 +1100 |
| commit | b1b37e3776c6e6e20f42140a907e296b65cc0c62 (patch) | |
| tree | 601f049791bcbd9df9daef64b0b1003dbf1a413b /source4/lib/replace/replace.h | |
| parent | 9e6b0c28712ee77ce878809c8576826a3ba08d95 (diff) | |
| parent | 52669d84722c175555e17a222077f845d9aa958f (diff) | |
| download | samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.tar.gz samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.tar.bz2 samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 400c16e7004bc3a881bb6efb99a273cdac87f70c)
Diffstat (limited to 'source4/lib/replace/replace.h')
| -rw-r--r-- | source4/lib/replace/replace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index 00c8230e6b..5fe79394eb 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -212,7 +212,7 @@ int rep_dlclose(void *handle); #ifndef HAVE_SOCKETPAIR #define socketpair rep_socketpair -int rep_socketpair(int d, int type, int protocol, int sv[2]); +/* prototype is in system/network.h */ #endif #ifndef PRINTF_ATTRIBUTE @@ -325,7 +325,7 @@ 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 +#if !defined(HAVE_INET_NTOA) || defined(REPLACE_INET_NTOA) #define inet_ntoa rep_inet_ntoa /* prototype is in "system/network.h" */ #endif |