X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source%2Flib%2Freplace%2Freplace.h;h=ca4becaa7087323c30ddec8d31f47ee498a9d520;hb=fd8802c4fd763c6cc3e1c0a84e7354990c8d949e;hp=af05516e8ceea7c1a738ef61596c93644d61b22b;hpb=36dea1248ca7a2512ea82a785756c69b805ae077;p=metze%2Fold%2Fv3-2-winbind-ndr.git diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h index af05516e8..ca4becaa7 100644 --- a/source/lib/replace/replace.h +++ b/source/lib/replace/replace.h @@ -1,15 +1,16 @@ -/* +/* Unix SMB/CIFS implementation. macros to go along with the lib/replace/ portability layer code Copyright (C) Andrew Tridgell 2005 Copyright (C) Jelmer Vernooij 2006 + Copyright (C) Jeremy Allison 2007. ** NOTE! The following LGPL license applies to the replace ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -71,7 +72,6 @@ #include #endif - #ifndef HAVE_STRERROR extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] @@ -139,7 +139,7 @@ int setenv(const char *name, const char *value, int overwrite); #ifndef HAVE_UNSETENV #define unsetenv rep_unsetenv -int rep_unsetenv(const char *name); +int rep_unsetenv(const char *name); #endif #ifndef HAVE_SETEUID @@ -163,7 +163,7 @@ char *rep_strcasestr(const char *haystack, const char *needle); #endif #ifndef HAVE_STRTOK_R -#define strtok_r rep_strtok_r +#define strtok_r rep_strtok_r char *rep_strtok_r(char *s, const char *delim, char **save_ptr); #endif @@ -330,6 +330,22 @@ 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 +#include "system/network.h" + +#ifndef HAVE_INET_PTON +int rep_inet_pton(int af, const char *src, void *dst); +#define inet_pton rep_inet_pton +#endif + +#ifndef HAVE_INET_NTOP +const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); +#define inet_ntop rep_inet_ntop +#endif + +#if !defined(HAVE_GETADDRINFO) +#include "system/getaddrinfo.h" +#endif + #ifdef HAVE_LIMITS_H #include #endif