[Cmake-commits] CMake branch, next, updated. v2.8.3-1582-g3821663

[Brad King]

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  38216636c2106d909e4fb808b96829d679ec5877 (commit)
       via  41b7b3efa4e2684085be7c7dd76baea17f269988 (commit)
      from  a3d1dc6fd41529ce9178e2eaa9376fbaddf10303 (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=38216636c2106d909e4fb808b96829d679ec5877
commit 38216636c2106d909e4fb808b96829d679ec5877
Merge: a3d1dc6 41b7b3e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 7 10:09:00 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 7 10:09:00 2011 -0500

    Merge topic 'linux-standard-base' into next
    
    41b7b3e libarchive: Define major/minor/makedev only where needed (#11648)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41b7b3efa4e2684085be7c7dd76baea17f269988
commit 41b7b3efa4e2684085be7c7dd76baea17f269988
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 7 10:06:50 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 7 10:06:50 2011 -0500

    libarchive: Define major/minor/makedev only where needed (#11648)
    
    If neither MAJOR_IN_MKDEV or MAJOR_IN_SYSMACROS is defined then provide
    our own implementation of these macros locally.  This complements the
    change in commit cf5ad183 (Fix major() check for LSB 4.0, 2011-01-12).
    This patch is based on upstream libarchive SVN commit 1553 (Shuffle the
    major/minor/makedev support a bit; this should work on both Windows and
    Haiku, 2009-10-31).
    
    Inspired-by: Tim Kientzle <kientzle at freebsd.org>

diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.c b/Utilities/cmlibarchive/libarchive/archive_entry.c
index d75dde5..c304231 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.c
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.c
@@ -32,12 +32,12 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.55 2008/12/23 05:01:4
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef MAJOR_IN_MKDEV
+#if MAJOR_IN_MKDEV
 #include <sys/mkdev.h>
-#else
-#ifdef MAJOR_IN_SYSMACROS
+#define HAVE_MAJOR
+#elif MAJOR_IN_SYSMACROS
 #include <sys/sysmacros.h>
-#endif
+#define HAVE_MAJOR
 #endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
@@ -75,6 +75,13 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.55 2008/12/23 05:01:4
 #undef max
 #define max(a, b)   ((a)>(b)?(a):(b))
 
+#if !defined(HAVE_MAJOR) && !defined(major)
+/* Replacement for major/minor/makedev. */
+#define	major(x) ((int)(0x00ff & ((x) >> 8)))
+#define	minor(x) ((int)(0xffff00ff & (x)))
+#define	makedev(maj,min) ((0xff00 & ((maj)<<8)) | (0xffff00ff & (min)))
+#endif
+
 /* Play games to come up with a suitable makedev() definition. */
 #ifdef __QNXNTO__
 /* QNX.  <sigh> */
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry_xattr.c b/Utilities/cmlibarchive/libarchive/archive_entry_xattr.c
index c35c7b3..28b8ff5 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry_xattr.c
+++ b/Utilities/cmlibarchive/libarchive/archive_entry_xattr.c
@@ -32,13 +32,6 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.55 2008/12/23 05:01:4
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef MAJOR_IN_MKDEV
-#include <sys/mkdev.h>
-#else
-#ifdef MAJOR_IN_SYSMACROS
-#include <sys/sysmacros.h>
-#endif
-#endif
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h b/Utilities/cmlibarchive/libarchive/archive_windows.h
index 17f5698..f85f3f0 100644
--- a/Utilities/cmlibarchive/libarchive/archive_windows.h
+++ b/Utilities/cmlibarchive/libarchive/archive_windows.h
@@ -94,11 +94,6 @@
 #endif
 #endif
 
-/* Replacement for major/minor/makedev. */
-#define major(x) ((int)(0x00ff & ((x) >> 8)))
-#define minor(x) ((int)(0xffff00ff & (x)))
-#define makedev(maj,min) ((0xff00 & ((maj)<<8))|(0xffff00ff & (min)))
-
 /* Alias the Windows _function to the POSIX equivalent. */
 #define access      _access
 #define chdir       __la_chdir

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

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_entry.c  |   15 +++++++++++----
 .../cmlibarchive/libarchive/archive_entry_xattr.c  |    7 -------
 .../cmlibarchive/libarchive/archive_windows.h      |    5 -----
 3 files changed, 11 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake