summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-01-15 16:34:06 +0100
committerStefan Metzmacher <metze@samba.org>2008-01-18 17:02:13 +0100
commitdb449a4c5f807b11ec723b11a2db32d09162e163 (patch)
treeb11d6335961d1e72de31148dd50239e0df5af7d7
parenta0e04a94170ffb54e8a809ed869a08af898fb723 (diff)
downloadsamba-db449a4c5f807b11ec723b11a2db32d09162e163.tar.gz
samba-db449a4c5f807b11ec723b11a2db32d09162e163.tar.bz2
samba-db449a4c5f807b11ec723b11a2db32d09162e163.zip
Revert "Host SerNet-AIX has __ss_family instead of ss_family in sockaddr_storage"
This reverts commit e33286f4a68352e55df081d06307f64f190773b3. 393bab185e0e9f02aac5740becc2aba2762133c8 is the v4-0-test fix for the same problem. metze (This used to be commit b8a57a24c390355c4950ca499c1d96aff80abad7)
-rw-r--r--source3/configure.in9
-rw-r--r--source3/lib/replace/system/network.h4
2 files changed, 0 insertions, 13 deletions
diff --git a/source3/configure.in b/source3/configure.in
index f65eb3c204..a34d42c478 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3051,15 +3051,6 @@ if test x"$samba_cv_HAVE_IFACE_IFREQ" = x"yes"; then
fi
fi
-dnl AIX 5.3.0.0
-AC_TRY_COMPILE([#include <sys/socket.h>],[
-struct sockaddr_storage s; s.__ss_family = 0],
-samba_cv_have_aix_sockaddr_storage=yes,samba_cv_have_aix_sockaddr_storage=no)
-
-if test x"$samba_cv_have_aix_sockaddr_storage" = x"yes"; then
- AC_DEFINE(HAVE_AIX_SOCKADDR_STORAGE, 1, [Whether struct sockaddr_storage has __sa_family])
-fi
-
if test $iface = no; then
AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[
SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h
index 2f387de5cf..fe6e46817f 100644
--- a/source3/lib/replace/system/network.h
+++ b/source3/lib/replace/system/network.h
@@ -242,10 +242,6 @@ typedef unsigned short int sa_family_t;
#endif
#endif
-#ifdef HAVE_AIX_SOCKADDR_STORAGE
-#define ss_family __ss_family
-#endif
-
#ifndef HAVE_STRUCT_ADDRINFO
#define HAVE_STRUCT_ADDRINFO
struct addrinfo {