r25128: _XOPEN_SOURCE_EXTENDED and socklen_t are always provided by libreplace

metze
(This used to be commit b3ee9adf28ee8136528d0236a3a2c894c2223053)

diff --git a/source3/configure.in b/source3/configure.in
index d978a804e646df9f3414cbeb1ed27e378e3e1fc2..031d530f65c862774377fc706a9c59503df71119 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -767,7 +767,6 @@ case "$host_os" in
                                AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to use large file support])
                                AC_DEFINE(_ALIGNMENT_REQUIRED, 1, [Required alignment])
                                AC_DEFINE(_MAX_ALIGNMENT, 4, [Maximum alignment])
-                               AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Unix 98 sources -- needed for socklen_t in getsockopt on HP/UX 11])
                                ;;
       esac
       ;;
@@ -1163,19 +1162,6 @@ if test x"$samba_cv_unixsocket" = x"yes"; then
 fi
 
 
-AC_CACHE_CHECK([for socklen_t type],samba_cv_socklen_t, [
-    AC_TRY_COMPILE([
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-#include <sys/socket.h>],[socklen_t i = 0],
-       samba_cv_socklen_t=yes,samba_cv_socklen_t=no)])
-if test x"$samba_cv_socklen_t" = x"yes"; then
-   AC_DEFINE(HAVE_SOCKLEN_T_TYPE,1,[Whether we have the variable type socklen_t])
-fi
-
 AC_CACHE_CHECK([for sig_atomic_t type],samba_cv_sig_atomic_t, [
     AC_TRY_COMPILE([
 #include <sys/types.h>

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5bb7227d0bbadf265d561dbbe285374775e402a7..4f11e7a0932a4b6a50a0797db6b53e2db290281c 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -303,12 +303,6 @@ typedef sig_atomic_t VOLATILE SIG_ATOMIC_T;
 typedef int VOLATILE SIG_ATOMIC_T;
 #endif
 
-#ifndef HAVE_SOCKLEN_T_TYPE
-#define HAVE_SOCKLEN_T_TYPE
-typedef int socklen_t;
-#endif
-
-
 #ifndef uchar
 #define uchar unsigned char
 #endif

diff --git a/source3/nsswitch/winbind_nss_config.h b/source3/nsswitch/winbind_nss_config.h
index ea764ee898512a92d9058b021d1c7e42aad63a85..d524aa8fb23399c2af692cb451c5095554c00ced 100644 (file)
--- a/source3/nsswitch/winbind_nss_config.h
+++ b/source3/nsswitch/winbind_nss_config.h
@@ -111,9 +111,4 @@ typedef int BOOL;
 #define S_ISSOCK(mode)  ((mode & S_IFSOCK) == S_IFSOCK)
 #endif
 
-#ifndef HAVE_SOCKLEN_T_TYPE
-#define HAVE_SOCKLEN_T_TYPE
-typedef int socklen_t;
-#endif
-
 #endif