merged RC_1_2 into RC_2_0

arvidn · Sep 11, 2021 · 3623664 · 3623664
2 parents 4f9e19d + 8ac128c
commit 3623664
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/mmap.cpp b/src/mmap.cpp
@@ -298,11 +298,11 @@ namespace {
 			;
 	}
 
-	int file_perms(open_mode_t const mode)
+	mode_t file_perms(open_mode_t const mode)
 	{
 		// rely on default umask to filter x and w permissions
 		// for group and others
-		int permissions = S_IRUSR | S_IWUSR
+		mode_t permissions = S_IRUSR | S_IWUSR
 			| S_IRGRP | S_IWGRP
 			| S_IROTH | S_IWOTH;
 

diff --git a/src/path.cpp b/src/path.cpp
@@ -524,7 +524,7 @@ namespace {
 
 		// rely on default umask to filter x and w permissions
 		// for group and others
-		int const permissions = S_IRUSR | S_IWUSR
+		mode_t const permissions = S_IRUSR | S_IWUSR
 			| S_IRGRP | S_IWGRP
 			| S_IROTH | S_IWOTH;