From cd6ae0de52164dd6f50b3614f2511acb3eb15993 Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Sun, 22 Feb 2009 00:43:38 +0100 Subject: all BSDs use this evironment variable Signed-off-by: Stefan Metzmacher --- lib/replace/libreplace_ld.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/replace') diff --git a/lib/replace/libreplace_ld.m4 b/lib/replace/libreplace_ld.m4 index 81bde46219..9529c5e0a5 100644 --- a/lib/replace/libreplace_ld.m4 +++ b/lib/replace/libreplace_ld.m4 @@ -292,7 +292,7 @@ AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR], *linux*) LIB_PATH_VAR=LD_LIBRARY_PATH ;; - *netbsd*) + *bsd*) LIB_PATH_VAR=LD_LIBRARY_PATH ;; *solaris*) -- cgit From faa1100d229aef56da5d48f5c19ec901e520f8ef Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 23 Feb 2009 16:22:43 -0800 Subject: More warning fixes for Solaris. Jeremy. --- lib/replace/getifaddrs.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lib/replace') diff --git a/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c index f6f0ec080c..3a91bb40d2 100644 --- a/lib/replace/getifaddrs.c +++ b/lib/replace/getifaddrs.c @@ -84,9 +84,6 @@ int rep_getifaddrs(struct ifaddrs **ifap) char buff[8192]; int fd, i, n; struct ifreq *ifr=NULL; - struct in_addr ipaddr; - struct in_addr nmask; - char *iname; struct ifaddrs *curif; struct ifaddrs *lastif = NULL; @@ -164,9 +161,6 @@ int rep_getifaddrs(struct ifaddrs **ifap) char buff[8192]; int fd, i, n; struct ifreq *ifr=NULL; - struct in_addr ipaddr; - struct in_addr nmask; - char *iname; struct ifaddrs *curif; struct ifaddrs *lastif = NULL; @@ -265,9 +259,6 @@ int rep_getifaddrs(struct ifaddrs **ifap) int fd, i; struct ifconf ifc; struct ifreq *ifr=NULL; - struct in_addr ipaddr; - struct in_addr nmask; - char *iname; struct ifaddrs *curif; struct ifaddrs *lastif = NULL; -- cgit From c21ae8d1bfd4423cf1c4a62c11ba228773548de2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 26 Feb 2009 10:29:55 +0100 Subject: libreplace: make it possible to disable socket_wrapper via -DSOCKET_WRAPPER_DISABLE=1 metze --- lib/replace/system/network.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/replace') diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h index 40d20db2d4..f135d175d4 100644 --- a/lib/replace/system/network.h +++ b/lib/replace/system/network.h @@ -327,10 +327,12 @@ struct addrinfo { #endif #ifdef SOCKET_WRAPPER +#ifndef SOCKET_WRAPPER_DISABLE #ifndef SOCKET_WRAPPER_NOT_REPLACE #define SOCKET_WRAPPER_REPLACE -#endif +#endif /* SOCKET_WRAPPER_NOT_REPLACE */ #include "../socket_wrapper/socket_wrapper.h" -#endif +#endif /* SOCKET_WRAPPER_DISABLE */ +#endif /* SOCKET_WRAPPER */ #endif -- cgit