diff options
| author | Andreas Schneider <asn@samba.org> | 2014-04-07 16:09:00 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-17 14:56:06 +0200 |
| commit | d407446ddc3dfa02c56e517d87238444f1c9b51b (patch) | |
| tree | 292e35f67204af46b2c9aac478386c1efea71604 /lib/replace | |
| parent | a9c1d5bd636c5d87a0e165361038671cead58550 (diff) | |
| download | samba-d407446ddc3dfa02c56e517d87238444f1c9b51b.tar.gz samba-d407446ddc3dfa02c56e517d87238444f1c9b51b.tar.xz samba-d407446ddc3dfa02c56e517d87238444f1c9b51b.zip | |
Remove special socket_wrapper code.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/getifaddrs.c | 2 | ||||
| -rw-r--r-- | lib/replace/system/network.h | 9 | ||||
| -rw-r--r-- | lib/replace/wscript | 3 |
3 files changed, 1 insertions, 13 deletions
diff --git a/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c index f07d7005e4..c2d20f80b8 100644 --- a/lib/replace/getifaddrs.c +++ b/lib/replace/getifaddrs.c @@ -23,8 +23,6 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#define SOCKET_WRAPPER_NOT_REPLACE - #include "replace.h" #include "system/network.h" diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h index 5159fc8c38..273cb716cf 100644 --- a/lib/replace/system/network.h +++ b/lib/replace/system/network.h @@ -367,13 +367,4 @@ struct addrinfo { #endif /* HAVE_LINUX_IPV6_V6ONLY_26 */ #endif /* HAVE_IPV6 */ -#ifdef SOCKET_WRAPPER -#ifndef SOCKET_WRAPPER_DISABLE -#ifndef SOCKET_WRAPPER_NOT_REPLACE -#define SOCKET_WRAPPER_REPLACE -#endif /* SOCKET_WRAPPER_NOT_REPLACE */ -#include "../socket_wrapper/socket_wrapper.h" -#endif /* SOCKET_WRAPPER_DISABLE */ -#endif /* SOCKET_WRAPPER */ - #endif diff --git a/lib/replace/wscript b/lib/replace/wscript index 680eb4ca1f..fd5b386e4e 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -561,7 +561,6 @@ removeea setea #define %s 1 #define NO_CONFIG_H 1 #define AUTOCONF_TEST 1 - #define SOCKET_WRAPPER_NOT_REPLACE #include "replace.c" #include "inet_ntop.c" #include "snprintf.c" @@ -617,7 +616,7 @@ def build(bld): REPLACE_HOSTCC_SOURCE, use_hostcc=True, use_global_deps=False, - cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_', + cflags='-D_SAMBA_HOSTCC_', group='compiler_libraries', deps = extra_libs ) |