Feature test for poll.h

cde/lib/csa/agent.c

@@ -28,14 +28,19 @@
  *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
  */
 
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
 #include <EUSCompat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
 #include <rpc/rpc.h>
-#if !defined(__linux__) && !defined(CSRG_BASED)
+#if HAVE_POLL_H
 # include <poll.h>
+#elif HAVE_SYS_POLL_H
+# include <sys/poll.h>
 #endif
 #if defined(SunOS)
 #include <netconfig.h>

cde/lib/tt/bin/tttrace/tttrace.C

@@ -31,6 +31,9 @@
  * Copyright (c) 1993 by Sun Microsystems, Inc.
  */
 
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -38,9 +41,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
-#if defined(__linux__)
+#if HAVE_SYS_POLL_H
 # include <sys/poll.h>
-#else
+#elif HAVE_POLL_H
 # include <poll.h>
 #endif
 #include <sys/types.h>

cde/lib/tt/lib/mp/mp_stream_socket.C

@@ -31,12 +31,15 @@
  *
  * Copyright (c) 1990 by Sun Microsystems, Inc.
  */
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
 #include "tt_options.h"
 #include <stdio.h>
 #include "mp/mp_stream_socket.h"
-#if defined(__linux__)
+#if HAVE_SYS_POLL_H
 #include <sys/poll.h>
-#else
+#elif HAVE_POLL_H
 #include <poll.h>
 #endif
 #include <sys/socket.h>

cde/lib/tt/lib/tttk/tttk.C

@@ -25,9 +25,12 @@
 //%%  (c) Copyright 1993, 1994 Sun Microsystems, Inc.			
 //%%  (c) Copyright 1993, 1994 Novell, Inc. 				
 //%%  $TOG: tttk.C /main/5 1999/09/14 13:00:44 mgreess $ 			 				
-#if defined(__linux__)
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
+#if HAVE_SYS_POLL_H
 # include <sys/poll.h>
-#else
+#elif HAVE_POLL_H
 # include <poll.h>
 #endif
 #include <errno.h>

cde/lib/tt/lib/util/tt_file_system.C

@@ -43,13 +43,15 @@
  * Defines a class for browsing the file system mount table.
  *
  */
-
+#if HAVE_CONFIG_H
+#include <cde_config.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#if defined(__linux__)
+#if HAVE_SYS_POLL_H
 # include <sys/poll.h>
-#else
+#elif HAVE_POLL_H
 # include <poll.h>
 #endif
 #include <sys/stat.h>