[Cmake-commits] CMake branch, next, updated. v2.8.3-1003-g82eb467

[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  82eb4672029c424bba3ef53b1d9896321efabd03 (commit)
       via  7e0b0014664d7db64ab13a31d0624e5d61b4227c (commit)
       via  8a61950e4223c551a291cb0cc25a7a0232b2690a (commit)
      from  6e99e12d11cb88bf691bcbc39f555589053c4c46 (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=82eb4672029c424bba3ef53b1d9896321efabd03
commit 82eb4672029c424bba3ef53b1d9896321efabd03
Merge: 6e99e12 7e0b001
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Dec 17 11:46:55 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 17 11:46:55 2010 -0500

    Merge topic 'dev/fix-cmcurl-try_run' into next
    
    7e0b001 Fix missed _POLL_EMUL_H_ and HAVE_POLL combo
    8a61950 Toss out strerror_r macros


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

    Fix missed _POLL_EMUL_H_ and HAVE_POLL combo

diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c
index 2bec8cb..51adbcf 100644
--- a/Utilities/cmcurl/select.c
+++ b/Utilities/cmcurl/select.c
@@ -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;
-#ifndef _POLL_EMUL_H_
+#if defined(HAVE_POLL) && !defined(_POLL_EMUL_H_)
   do {
     r = poll(ufds, nfds, timeout_ms);
   } while((r == -1) && (errno == EINTR));

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

    Toss out strerror_r macros

diff --git a/Utilities/cmcurl/config.h.in b/Utilities/cmcurl/config.h.in
index 72a1cd4..6e74935 100644
--- a/Utilities/cmcurl/config.h.in
+++ b/Utilities/cmcurl/config.h.in
@@ -171,9 +171,6 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #cmakedefine HAVE_GETTIMEOFDAY ${HAVE_GETTIMEOFDAY}
 
-/* we have a glibc-style strerror_r() */
-#cmakedefine HAVE_GLIBC_STRERROR_R ${HAVE_GLIBC_STRERROR_R}
-
 /* Define to 1 if you have the `gmtime_r' function. */
 #cmakedefine HAVE_GMTIME_R ${HAVE_GMTIME_R}
 
@@ -348,9 +345,6 @@
 /* Define to 1 if you have the `poll' function. */
 #cmakedefine HAVE_POLL ${HAVE_POLL}
 
-/* we have a POSIX-style strerror_r() */
-#cmakedefine HAVE_POSIX_STRERROR_R ${HAVE_POSIX_STRERROR_R}
-
 /* Define to 1 if you have the <process.h> header file. */
 #cmakedefine HAVE_PROCESS_H ${HAVE_PROCESS_H}
 
@@ -441,9 +435,6 @@
 /* Define to 1 if you have the `strdup' function. */
 #cmakedefine HAVE_STRDUP ${HAVE_STRDUP}
 
-/* Define to 1 if you have the `strerror_r' function. */
-#cmakedefine HAVE_STRERROR_R ${HAVE_STRERROR_R}
-
 /* Define to 1 if you have the `stricmp' function. */
 #cmakedefine HAVE_STRICMP ${HAVE_STRICMP}
 

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

Summary of changes:
 Utilities/cmcurl/config.h.in |    9 ---------
 Utilities/cmcurl/select.c    |    2 +-
 2 files changed, 1 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake