Browse Source

Use _POLL_EMUL_H_ instead of HAVE_POLL_FINE

Headers define _POLL_EMUL_H_ if they are not in the kernel, so a try_run
check for them is not necessary.
Ben Boeckel 15 years ago
parent
commit
8d36890723

+ 0 - 8
Utilities/cmcurl/CMake/OtherTests.cmake

@@ -193,14 +193,6 @@ SET(EXTRA_DEFINES "${EXTRA_DEFINES}\n${headers_hack}\n#define __unused5")
 CURL_CHECK_C_SOURCE_COMPILES("struct timeval ts;\nts.tv_sec  = 0;\nts.tv_usec = 0" HAVE_STRUCT_TIMEVAL)
 
 
-INCLUDE(CurlCheckCSourceRuns)
-SET(EXTRA_DEFINES)
-SET(HEADER_INCLUDES)
-IF(HAVE_SYS_POLL_H)
-  SET(HEADER_INCLUDES "sys/poll.h")
-ENDIF(HAVE_SYS_POLL_H)
-CURL_CHECK_C_SOURCE_RUNS("return poll((void *)0, 0, 10 /*ms*/)" HAVE_POLL_FINE)
-
 SET(HAVE_SIG_ATOMIC_T 1)
 SET(EXTRA_DEFINES)
 SET(HEADER_INCLUDES)

+ 0 - 3
Utilities/cmcurl/config.h.in

@@ -348,9 +348,6 @@
 /* Define to 1 if you have the `poll' function. */
 #cmakedefine HAVE_POLL ${HAVE_POLL}
 
-/* If you have a fine poll */
-#cmakedefine HAVE_POLL_FINE ${HAVE_POLL_FINE}
-
 /* we have a POSIX-style strerror_r() */
 #cmakedefine HAVE_POSIX_STRERROR_R ${HAVE_POSIX_STRERROR_R}
 

+ 3 - 3
Utilities/cmcurl/select.c

@@ -78,7 +78,7 @@
  */
 int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
 {
-#if defined(HAVE_POLL_FINE) || defined(CURL_HAVE_WSAPOLL)
+#if !defined(_POLL_EMUL_H_) || defined(CURL_HAVE_WSAPOLL)
   struct pollfd pfd[2];
   int num;
   int r;
@@ -96,7 +96,7 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
     num++;
   }
 
-#ifdef HAVE_POLL_FINE
+#ifndef _POLL_EMUL_H_
   do {
     r = poll(pfd, num, timeout_ms);
   } while((r == -1) && (errno == EINTR));
@@ -220,7 +220,7 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
 int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
 {
   int r;
-#ifdef HAVE_POLL_FINE
+#ifndef _POLL_EMUL_H_
   do {
     r = poll(ufds, nfds, timeout_ms);
   } while((r == -1) && (errno == EINTR));