Feature test for poll.h

cde/programs/dtmail/libDtMail/Common/Process.C

@@ -41,12 +41,19 @@
  *+ENOTICE
  */
 
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
+#if HAVE_POLL_H
 #include <poll.h>
+#elif HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
 
 /*
 ** file included for INFTIM

cde/programs/dtmail/libDtMail/RFC/SunV3.C

@@ -40,13 +40,20 @@
  *+ENOTICE
  */
 
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
 #include <EUSCompat.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#if HAVE_POLL_H
 #include <poll.h>
+#elif HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#endif
 #include <fcntl.h>
 #include <assert.h>
 #include <signal.h>

cde/programs/dtscreen/dtscreen.h

@@ -87,15 +87,24 @@ extern void unhide_hft_ring();
 
 /* System V Release 4 redefinitions of BSD functions and structures */
 
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
+
 #if defined (SYSV) || defined (SVR4)
 
+#if HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#elif HAVE_POLL_H
+#include <poll.h>
+#endif
+
 #include <sys/time.h>
 #define passwd spwd
 #define pw_passwd sp_pwdp
 #if defined(AIXV3)
 #undef NULL
 #define NULL 0
-#include <sys/poll.h>
 
 struct passwd {
         char    *pw_name;
@@ -107,7 +116,6 @@ struct passwd {
         char    *pw_shell;
 };
 #else
-#include <poll.h>
 #include <shadow.h>
 #define getpwnam getspnam
 #endif