diff options
| author | Michael Adam <obnox@samba.org> | 2008-03-18 12:16:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-03-18 16:44:59 +0100 |
| commit | 5c73dabd49bfca840c062e8c49d8765dc0e4531e (patch) | |
| tree | 481917c0100432b1f49129ed20cfa5760b284a16 /source3/lib/replace/replace.h | |
| parent | a4d7cbcb2f9af300b005457867903387fb61a532 (diff) | |
| download | samba-5c73dabd49bfca840c062e8c49d8765dc0e4531e.tar.gz samba-5c73dabd49bfca840c062e8c49d8765dc0e4531e.tar.bz2 samba-5c73dabd49bfca840c062e8c49d8765dc0e4531e.zip | |
libreplace: replace inet_ntoa() when it is missing
...not only replace it when it is broken.
This moves the defintion of rep_inet_ntoa from replace.c
to inet_ntoa.c and adds configure checks for existence
of inet_ntoa(). Checks are moved to an include file of its own.
NOTE: The original rep_inet_ntoa in replace.c was wrapped
into a "#ifndef WITH_PTHREADS" but the prototype in replace.h
and the define in system/network.h were not. I removed that
ifndef since the inet_ntoa() function is usually not thread safe
anyways, since it returns a pointer to a static buffer.
So whoever calls inet_ntoa() should be aware that it is not
thread safe anyways.
Michael
(cherry picked from commit 974c0c45ad42644348e0b55454715b12158f1028)
(This used to be commit edcf2712bcdedabbfdd9ee8b9a18f46126930636)
Diffstat (limited to 'source3/lib/replace/replace.h')
| -rw-r--r-- | source3/lib/replace/replace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 00c8230e6b..383536da65 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -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 |