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 a0037c9b5328ef0bba9d276bde054c2f690e2665 (commit)
via 52285a993b714c81d8d79fddde2631612dab335c (commit)
from 6b7254a1f9c3a3551e4925b6d38f9ea03edd6628 (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=a0037c9b5328ef0bba9d276bde054c2f690e2665
commit a0037c9b5328ef0bba9d276bde054c2f690e2665
Merge: 6b7254a 52285a9
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Sun Mar 9 10:41:18 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Mar 9 10:41:18 2014 -0400
Merge topic 'watcom-compile-libarchive' into next
52285a99 libarchive: Fix compliation with Open Watcom
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52285a993b714c81d8d79fddde2631612dab335c
commit 52285a993b714c81d8d79fddde2631612dab335c
Author: Jiri Malak <malak.j...@gmail.com>
AuthorDate: Tue Mar 4 16:35:44 2014 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Sun Mar 9 10:36:21 2014 -0400
libarchive: Fix compliation with Open Watcom
diff --git a/Utilities/cmlibarchive/libarchive/archive.h
b/Utilities/cmlibarchive/libarchive/archive.h
index 1a1d32a..83d2c16 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -54,7 +54,7 @@
/* Get appropriate definitions of standard POSIX-style types. */
/* These should match the types used in 'struct stat' */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
# define __LA_INT64_T __int64
# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
# define __LA_SSIZE_T ssize_t
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h
b/Utilities/cmlibarchive/libarchive/archive_entry.h
index 85ea885..ae6a76e 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.h
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.h
@@ -48,7 +48,7 @@
#endif
/* Get a suitable 64-bit integer type. */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
# define __LA_INT64_T __int64
#else
#include <unistd.h>
@@ -63,7 +63,7 @@
#if ARCHIVE_VERSION_NUMBER >= 3999000
/* Switch to plain 'int' for libarchive 4.0. It's less broken than 'mode_t' */
# define __LA_MODE_T int
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
+#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__) &&
!defined(__WATCOMC__)
# define __LA_MODE_T unsigned short
#else
# define __LA_MODE_T mode_t
diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h
b/Utilities/cmlibarchive/libarchive/archive_windows.h
index 620810c..1dd61b6 100644
--- a/Utilities/cmlibarchive/libarchive/archive_windows.h
+++ b/Utilities/cmlibarchive/libarchive/archive_windows.h
@@ -188,6 +188,9 @@
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) /* directory */
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) /* regular file
*/
#endif
+
+#if !defined(__WATCOMC__)
+
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) /* Symbolic link */
#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) /* Socket */
@@ -227,6 +230,8 @@
#define S_IWOTH _S_IWOTH
#define S_IROTH _S_IROTH
+#endif
+
#define F_DUPFD 0 /* Duplicate file descriptor. */
#define F_GETFD 1 /* Get file descriptor flags. */
#define F_SETFD 2 /* Set file descriptor flags. */
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmlibarchive/libarchive/archive.h | 2 +-
Utilities/cmlibarchive/libarchive/archive_entry.h | 4 ++--
Utilities/cmlibarchive/libarchive/archive_windows.h | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
