streamline group attr specification/diagnostics

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 384a80aa3b71e313b310f63d5453b203508d813d..0496c4d62c92e079bf101ac64e00c7d6219e01ec 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,6 +23,8 @@
 
 #ifdef HAVE_POLL_H
 #include <poll.h>
+#elif defined(HAVE_SYS_POLL_H)
+#include <sys/poll.h>
 #endif
 
 #ifdef HAVE_SYS_SOCKET_H
@@ -101,6 +103,7 @@
 
 #undef sock_errno
 #undef sock_errstr
+#undef sock_errset
 #define        sock_errno()    WSAGetLastError()
 #define        sock_errstr(e)  ber_pvt_wsa_err2string(e)
 #define        sock_errset(e)  WSASetLastError(e)
@@ -219,7 +222,7 @@ LDAP_LUTIL_F( int ) getpeereid( int s, uid_t *, gid_t * );
 #define        NI_MAXHOST      256
 #endif
 
-#ifdef HAVE_POLL_H
+#ifdef HAVE_POLL
 # ifndef INFTIM
 #  define INFTIM (-1)
 # endif