[Cmake-commits] CMake branch, next, updated. v2.8.3-998-gdae4459

[Ben Boeckel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  dae445947f3c88c154de2effb0a441e44b3f2149 (commit)
       via  44fca8b51af2e198d2d2cc6a2ad5f18838f9d235 (commit)
      from  8973f231b5f36b8eae8044c0112bda3229ca96fb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dae445947f3c88c154de2effb0a441e44b3f2149
commit dae445947f3c88c154de2effb0a441e44b3f2149
Merge: 8973f23 44fca8b
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Dec 17 11:25:28 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 17 11:25:28 2010 -0500

    Merge topic 'dev/fix-cmcurl-try_run' into next
    
    44fca8b Check for poll when looking for _POLL_EMUL_H_


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44fca8b51af2e198d2d2cc6a2ad5f18838f9d235
commit 44fca8b51af2e198d2d2cc6a2ad5f18838f9d235
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Dec 17 11:18:04 2010 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Dec 17 11:18:49 2010 -0500

    Check for poll when looking for _POLL_EMUL_H_

diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c
index 3656edd..2bec8cb 100644
--- a/Utilities/cmcurl/select.c
+++ b/Utilities/cmcurl/select.c
@@ -78,7 +78,7 @@
  */
 int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
 {
-#if !defined(_POLL_EMUL_H_) || defined(CURL_HAVE_WSAPOLL)
+#if (defined(HAVE_POLL) && !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++;
   }
 
-#ifndef _POLL_EMUL_H_
+#if defined(HAVE_POLL) && !defined(_POLL_EMUL_H_)
   do {
     r = poll(pfd, num, timeout_ms);
   } while((r == -1) && (errno == EINTR));

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmcurl/select.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake