$NetBSD: patch-aa,v 1.2 2012/01/12 15:47:45 hans Exp $

--- gnuradio-core/src/lib/runtime/gr_dispatcher.cc.orig	2008-05-09 18:35:10.000000000 +1200
+++ gnuradio-core/src/lib/runtime/gr_dispatcher.cc
@@ -30,18 +30,17 @@
 #include <stdio.h>
 
 #ifdef HAVE_SELECT
+#  ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#  endif
 #  ifdef HAVE_SYS_SELECT_H
 #    include <sys/select.h>
-#  else
-#    ifdef HAVE_SYS_TIME_H
-#      include <sys/time.h>
-#    endif
-#    ifdef HAVE_SYS_TYPES_H
-#      include <sys/types.h>
-#    endif
-#    ifdef HAVE_UNISTD_H
-#      include <unistd.h>
-#    endif
+#  endif
+#  ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#  endif
+#  ifdef HAVE_UNISTD_H
+#    include <unistd.h>
 #  endif
 #endif
 
@@ -44,6 +44,9 @@
 #  endif
 #endif
 
+#ifdef __sun
+#include <string.h>		/* for memset(), used by FD_ZERO */
+#endif
 
 static gr_dispatcher_sptr s_singleton;