[Cmake-commits] CMake branch, next, updated. v2.8.8-2621-g730e964

Brad King brad.king at kitware.com
Thu Apr 19 09:01:59 EDT 2012


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  730e964cb79902a3a1c39f12c2ddc52971da43a3 (commit)
       via  a8995ebe35885f9170cc3856d3208c813fb8e451 (commit)
      from  aec9c6ed79ea47a17d44ea4928e99b56df3b61a8 (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=730e964cb79902a3a1c39f12c2ddc52971da43a3
commit 730e964cb79902a3a1c39f12c2ddc52971da43a3
Merge: aec9c6e a8995eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 09:01:55 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 19 09:01:55 2012 -0400

    Merge topic 'compile-XL-v6' into next
    
    a8995eb libarchive: Avoid trailing , in enum for XL v6 (#13148)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8995ebe35885f9170cc3856d3208c813fb8e451
commit a8995ebe35885f9170cc3856d3208c813fb8e451
Author:     Jim Hague <jim.hague at acm.org>
AuthorDate: Thu Apr 19 08:52:45 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 09:00:29 2012 -0400

    libarchive: Avoid trailing , in enum for XL v6 (#13148)
    
    IBM xlc v6 cannot cope with a trailing ',' in enum definitions.

diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
index 87136a6..0b9aaf9 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
@@ -197,7 +197,7 @@ struct isofile {
 	enum {
 		NO = 0,
 		BOOT_CATALOG,
-		BOOT_IMAGE,
+		BOOT_IMAGE
 	} boot;
 
 	/*
@@ -850,7 +850,7 @@ enum dir_rec_type {
 	DIR_REC_VD,		/* Stored in Volume Descriptor.	*/
 	DIR_REC_SELF,		/* Stored as Current Directory.	*/
 	DIR_REC_PARENT,		/* Stored as Parent Directory.	*/
-	DIR_REC_NORMAL,		/* Stored as Child.		*/
+	DIR_REC_NORMAL 		/* Stored as Child.		*/
 };
 
 /*
@@ -860,7 +860,7 @@ enum vdc {
 	VDC_STD,
 	VDC_LOWERCASE,
 	VDC_UCS2,
-	VDC_UCS2_DIRECT,
+	VDC_UCS2_DIRECT
 };
 
 /*
@@ -897,7 +897,7 @@ struct idr {
 
 enum char_type {
 	A_CHAR,
-	D_CHAR,
+	D_CHAR
 };
 
 
@@ -3989,7 +3989,7 @@ enum keytype {
 	KEY_FLG,
 	KEY_STR,
 	KEY_INT,
-	KEY_HEX,
+	KEY_HEX
 };
 static void
 set_option_info(struct archive_string *info, int *opt, const char *key,

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

Summary of changes:
 .../libarchive/archive_write_set_format_iso9660.c  |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list