[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-981-g3cc9809

Brad King brad.king at kitware.com
Tue Nov 8 11:54:57 EST 2016


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  3cc9809f374ea224a24d145b85a3af8cffb4c2fd (commit)
       via  c807a70ac156634225b91300a0b1038229edeab4 (commit)
      from  0f1eae2d3d7bed2bcfde648e99150676c4cebe5b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cc9809f374ea224a24d145b85a3af8cffb4c2fd
commit 3cc9809f374ea224a24d145b85a3af8cffb4c2fd
Merge: 0f1eae2 c807a70
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 8 11:54:56 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 8 11:54:56 2016 -0500

    Merge topic 'import-librhash' into next
    
    c807a70a fixup! librhash: Remove source fragments not needed for CMake


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c807a70ac156634225b91300a0b1038229edeab4
commit c807a70ac156634225b91300a0b1038229edeab4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 8 11:54:46 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 8 11:54:46 2016 -0500

    fixup! librhash: Remove source fragments not needed for CMake

diff --git a/Utilities/cmlibrhash/librhash/rhash.c b/Utilities/cmlibrhash/librhash/rhash.c
index 06a5da6..ad6249b 100644
--- a/Utilities/cmlibrhash/librhash/rhash.c
+++ b/Utilities/cmlibrhash/librhash/rhash.c
@@ -685,7 +685,6 @@ RHASH_API size_t rhash_print_magnet(char* output, const char* filepath,
 
 	return (output - begin);
 }
-#endif
 
 /* hash sum output */
 
@@ -870,3 +869,4 @@ RHASH_API rhash_uptr_t rhash_transmit(unsigned msg_id, void* dst, rhash_uptr_t l
 	}
 	return 0;
 }
+#endif

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

Summary of changes:
 Utilities/cmlibrhash/librhash/rhash.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list