1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Tue, 4 Apr 2017 16:46:50 +0000
Subject: [PATCH] Fix build with musl on ppc64le
mosh was breaking when building in ppc64le using musl, because ioctl() is defined
as ioctl(int, int) in musl and mosh is using TIOCSWINSZ macro as parameter. This was
triggering a gcc warning and make the build fail.
This patch does an explicit integer conversion in TIOCSWINSZ, as no bits get
lost.
--- a/src/frontend/mosh-server.cc
+++ b/src/frontend/mosh-server.cc
@@ -714,7 +714,12 @@
}
window_size.ws_col = res->width;
window_size.ws_row = res->height;
- if ( ioctl( host_fd, TIOCSWINSZ, &window_size ) < 0 ) {
+
+ #if defined(__powerpc64__) && (!defined(__GLIBC__) && !defined(__UCLIBC__))
+ if ( ioctl( host_fd, (int) TIOCSWINSZ, &window_size ) < 0 ) {
+ #else
+ if ( ioctl( host_fd, TIOCSWINSZ, &window_size ) < 0 ) {
+ #endif
perror( "ioctl TIOCSWINSZ" );
network.start_shutdown();
}
--- a/src/examples/termemu.cc
+++ a/src/examples/termemu.cc
@@ -226,7 +226,11 @@
}
/* tell child process */
+ #if defined(__powerpc64__) && (!defined(__GLIBC__) && !defined(__UCLIBC__))
+ if ( ioctl( fd, (int) TIOCSWINSZ, &window_size ) < 0 ) {
+ #else
if ( ioctl( fd, TIOCSWINSZ, &window_size ) < 0 ) {
+ #endif
perror( "ioctl TIOCSWINSZ" );
return;
}
@@ -306,7 +310,11 @@
complete.act( &r );
/* tell child process */
+ #if defined(__powerpc64__) && (!defined(__GLIBC__) && !defined(__UCLIBC__))
+ if ( ioctl( fd, (int) TIOCSWINSZ, &window_size ) < 0 ) {
+ #else
if ( ioctl( fd, TIOCSWINSZ, &window_size ) < 0 ) {
+ #endif
perror( "ioctl TIOCSWINSZ" );
return;
}
|
