branching: merge stable into default
authorRaphaël Gomès <rgomes@octobus.net>
Tue, 15 Mar 2022 09:26:26 +0100
changeset 48965 a82f5d2b48fb
parent 48963 7e18fc0bc46c (current diff)
parent 48964 9ce563fb2989 (diff)
child 48969 f64bbba2ee59
branching: merge stable into default
mercurial/cext/revlog.c
--- a/mercurial/cext/revlog.c	Mon Mar 14 12:24:34 2022 -0700
+++ b/mercurial/cext/revlog.c	Tue Mar 15 09:26:26 2022 +0100
@@ -168,7 +168,7 @@
 /* next free offset: 73 */
 
 static const char comp_mode_inline = 2;
-static const char rank_unknown = -1;
+static const int rank_unknown = -1;
 
 static void raise_revlog_error(void)
 {
--- a/rust/hg-core/src/lock.rs	Mon Mar 14 12:24:34 2022 -0700
+++ b/rust/hg-core/src/lock.rs	Tue Mar 15 09:26:26 2022 +0100
@@ -145,7 +145,7 @@
 
         /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414
         const BUFFER_SIZE: usize = 1024;
-        let mut buffer = [0_i8; BUFFER_SIZE];
+        let mut buffer = [0 as libc::c_char; BUFFER_SIZE];
         let hostname_bytes = unsafe {
             let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE);
             if result != 0 {