tavl_delete: copy balance factor

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 304ed2174b57ef52d68fe4b08397958f4e793cf1..82230b967de04ad6c2decadd2d689e37ced1cdcf 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -1,14 +1,17 @@
 /* Generic socket.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_SOCKET_H_
@@ -18,6 +21,10 @@
 #include <sys/types.h>
 #endif
 
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 
@@ -192,7 +199,7 @@ LDAP_F (int) ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
 #      define INET6_ADDRSTRLEN 46
 #endif
 
-#ifdef HAVE_GETADDRINFO
+#if defined( HAVE_GETADDRINFO ) || defined( HAVE_GETNAMEINFO )
 #      ifdef HAVE_GAI_STRERROR
 #              define AC_GAI_STRERROR(x)       (gai_strerror((x)))
 #      else
@@ -205,4 +212,21 @@ LDAP_F (int) ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
 LDAP_LUTIL_F( int ) getpeereid( int s, uid_t *, gid_t * );
 #endif
 
+/* DNS RFC defines max host name as 255. New systems seem to use 1024 */
+#ifndef NI_MAXHOST
+#define        NI_MAXHOST      256
+#endif
+
+#ifdef HAVE_POLL_H
+# ifndef INFTIM
+#  define INFTIM (-1)
+# endif
+#undef POLL_OTHER
+#define POLL_OTHER   (POLLERR|POLLHUP)
+#undef POLL_READ
+#define POLL_READ    (POLLIN|POLLPRI|POLL_OTHER)
+#undef POLL_WRITE              
+#define POLL_WRITE   (POLLOUT|POLL_OTHER)
+#endif
+
 #endif /* _AC_SOCKET_H_ */