diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-08-17 21:52:34 (GMT) |
---|---|---|
committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-08-17 21:52:34 (GMT) |
commit | 373b2e483d983136415190dcc838e636077e5991 (patch) | |
tree | 1a2db4bce22de2029d88aaae403127fe857c3787 /Source | |
parent | 67a7dcef45fef6172514d6df1bea3ca94a04735a (diff) | |
download | CMake-373b2e483d983136415190dcc838e636077e5991.zip CMake-373b2e483d983136415190dcc838e636077e5991.tar.gz CMake-373b2e483d983136415190dcc838e636077e5991.tar.bz2 |
cmArchiveWrite: replace mode_t with int
Rationale:
* mode_t is not defined on all platforms
* bitmasking (operator &) promotes the value to an int anyway
* libarchive uses int in the public api starting with version 4
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmArchiveWrite.cxx | 2 | ||||
-rw-r--r-- | Source/cmArchiveWrite.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index 3da4f28..56da2ac 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -268,7 +268,7 @@ bool cmArchiveWrite::AddFile(const char* file, size_t skip, const char* prefix) } if (this->PermissionsMask.IsSet()) { - mode_t perm = archive_entry_perm(e); + int perm = archive_entry_perm(e); archive_entry_set_perm(e, perm & this->PermissionsMask.Get()); } diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h index f847d09..b15c15a 100644 --- a/Source/cmArchiveWrite.h +++ b/Source/cmArchiveWrite.h @@ -94,7 +94,7 @@ public: void SetMTime(std::string const& t) { this->MTime = t; } //! Sets the permissions of the added files/folders - void SetPermissions(mode_t permissions_) + void SetPermissions(int permissions_) { this->Permissions.Set(permissions_); } @@ -107,7 +107,7 @@ public: //! The permissions will be copied from the existing file //! or folder. The mask will then be applied to unset //! some of them - void SetPermissionsMask(mode_t permissionsMask_) + void SetPermissionsMask(int permissionsMask_) { this->PermissionsMask.Set(permissionsMask_); } @@ -177,8 +177,8 @@ private: //!@} //! Permissions on files/folders - cmArchiveWriteOptional<mode_t> Permissions; - cmArchiveWriteOptional<mode_t> PermissionsMask; + cmArchiveWriteOptional<int> Permissions; + cmArchiveWriteOptional<int> PermissionsMask; }; #endif |