Winsock2.h also has definition for timeval and so on, it conflicts with our own definitions.

This commit was SVN r18009.

opal/event/event.c

@@ -40,7 +40,9 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
+#  ifndef HAVE_WINSOCK2_H
 #include <sys/_time.h>
+#  endif
 #endif
 #ifndef HAVE_TIMERADD
 #include <sys/_timeradd.h>

opal/event/log.c

@@ -49,7 +49,9 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
+#  ifndef HAVE_WINSOCK2_H
 #include <sys/_time.h>
+#  endif
 #endif
 #include <stdio.h>
 #include <stdlib.h>

opal/event/select.c

@@ -34,7 +34,9 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
+#  ifndef HAVE_WINSOCK2_H
 #include <sys/_time.h>
+#  endif
 #endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>