[Cmake-commits] CMake branch, master, updated. aa1450bda1d8a6751e6459e83786918cc0a7124a

cmake-commits at cmake.org cmake-commits at cmake.org
Thu May 6 08:50:44 EDT 2010


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, master has been updated
       via  aa1450bda1d8a6751e6459e83786918cc0a7124a (commit)
      from  0ac7f85d20c7e53652c2c05128d8c454cb316be4 (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=aa1450bda1d8a6751e6459e83786918cc0a7124a
commit aa1450bda1d8a6751e6459e83786918cc0a7124a
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Thu May 6 08:48:14 2010 -0400

    Fix build on borland windows, by adding back typedef for pid_t.

diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h b/Utilities/cmlibarchive/libarchive/archive_windows.h
index 9ded13a..17f5698 100644
--- a/Utilities/cmlibarchive/libarchive/archive_windows.h
+++ b/Utilities/cmlibarchive/libarchive/archive_windows.h
@@ -296,9 +296,9 @@ struct _timeval64i32 {
 #define __timeval _timeval64i32
 #endif
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
     typedef int pid_t;
-#endif // _MSC_VER
+#endif /* _MSC_VER __BORLANDC__ */
 
 /* Message digest define */
 #if !defined(HAVE_OPENSSL_MD5_H) && !defined(HAVE_OPENSSL_SHA_H)

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

Summary of changes:
 .../cmlibarchive/libarchive/archive_windows.h      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list