X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsys_select.in.h;h=5a4b7a5a4d9cf37e50614c5d6f3f9a921538957d;hb=d952dbeaa9ceb3f9cef0684e7d9d3ecfa71a6294;hp=341543b87e1884cbec74e7d12636c579abd91bac;hpb=76bb60b45a1c498821ac465603e335f7af9dbe48;p=gnulib.git

diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 341543b87..5a4b7a5a4 100644
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -25,6 +25,10 @@
    <sys/types.h>.  */
 # include <sys/types.h>
 
+/* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
+   of 'struct timeval', and no definition of this type..  */
+# include <sys/time.h>
+
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
 
@@ -40,10 +44,24 @@
 # include <sys/socket.h>
 
 # if @HAVE_WINSOCK2_H@
-#  undef select
-#  define select		rpl_select
 
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+
+#  if @GNULIB_SELECT@
+#   undef select
+#   define select rpl_select
 extern int rpl_select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
+#  else
+#   undef select
+#   define select select_used_without_requesting_gnulib_module_select
+#  endif
+
+#  ifdef __cplusplus
+}
+#  endif
+
 # endif
 
 #endif