1*4882a593SmuzhiyunFrom eb0e14f8a5c414603b2e882df54b9fec138104ec Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Dima Krasner <dima@dimakrasner.com> 3*4882a593SmuzhiyunDate: Wed, 12 Nov 2014 23:06:46 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Added musl support to libgpm and the daemon. 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun[Upstream patch backported from the github repository, 7*4882a593Smuzhiyunhttps://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe.] 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun src/daemon/open_console.c | 1 + 12*4882a593Smuzhiyun src/prog/display-buttons.c | 1 + 13*4882a593Smuzhiyun src/prog/display-coords.c | 1 + 14*4882a593Smuzhiyun src/prog/gpm-root.y | 4 ++-- 15*4882a593Smuzhiyun 4 files changed, 5 insertions(+), 2 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/src/daemon/open_console.c b/src/daemon/open_console.c 18*4882a593Smuzhiyunindex 98297c9..4d6c0af 100644 19*4882a593Smuzhiyun--- a/src/daemon/open_console.c 20*4882a593Smuzhiyun+++ b/src/daemon/open_console.c 21*4882a593Smuzhiyun@@ -21,6 +21,7 @@ 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun #include <fcntl.h> /* open and co. */ 24*4882a593Smuzhiyun #include <sys/stat.h> /* stat() */ 25*4882a593Smuzhiyun+#include <sys/types.h> /* major() */ 26*4882a593Smuzhiyun #include <sys/ioctl.h> /* ioctl */ 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun /* Linux specific (to be outsourced in gpm2 */ 29*4882a593Smuzhiyundiff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c 30*4882a593Smuzhiyunindex de8e5b2..38d2f11 100644 31*4882a593Smuzhiyun--- a/src/prog/display-buttons.c 32*4882a593Smuzhiyun+++ b/src/prog/display-buttons.c 33*4882a593Smuzhiyun@@ -36,6 +36,7 @@ 34*4882a593Smuzhiyun #include <stdio.h> /* printf() */ 35*4882a593Smuzhiyun #include <time.h> /* time() */ 36*4882a593Smuzhiyun #include <errno.h> /* errno */ 37*4882a593Smuzhiyun+#include <sys/select.h> /* fd_set and FD_* */ 38*4882a593Smuzhiyun #include <gpm.h> /* gpm information */ 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun /* display resulting data */ 41*4882a593Smuzhiyundiff --git a/src/prog/display-coords.c b/src/prog/display-coords.c 42*4882a593Smuzhiyunindex ed15c8a..411283a 100644 43*4882a593Smuzhiyun--- a/src/prog/display-coords.c 44*4882a593Smuzhiyun+++ b/src/prog/display-coords.c 45*4882a593Smuzhiyun@@ -37,6 +37,7 @@ 46*4882a593Smuzhiyun #include <stdio.h> /* printf() */ 47*4882a593Smuzhiyun #include <time.h> /* time() */ 48*4882a593Smuzhiyun #include <errno.h> /* errno */ 49*4882a593Smuzhiyun+#include <sys/select.h> /* fd_set and FD_* */ 50*4882a593Smuzhiyun #include <gpm.h> /* gpm information */ 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun /* display resulting data */ 53*4882a593Smuzhiyundiff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y 54*4882a593Smuzhiyunindex 069d801..188ae35 100644 55*4882a593Smuzhiyun--- a/src/prog/gpm-root.y 56*4882a593Smuzhiyun+++ b/src/prog/gpm-root.y 57*4882a593Smuzhiyun@@ -1199,9 +1199,9 @@ int main(int argc, char **argv) 58*4882a593Smuzhiyun #if defined(__GLIBC__) 59*4882a593Smuzhiyun __sigemptyset(&childaction.sa_mask); 60*4882a593Smuzhiyun #else /* __GLIBC__ */ 61*4882a593Smuzhiyun- childaction.sa_mask=0; 62*4882a593Smuzhiyun+ sigemptyset(&childaction.sa_mask); 63*4882a593Smuzhiyun #endif /* __GLIBC__ */ 64*4882a593Smuzhiyun- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */ 65*4882a593Smuzhiyun+ childaction.sa_flags=0; 66*4882a593Smuzhiyun sigaction(SIGCHLD,&childaction,NULL); 67*4882a593Smuzhiyun 68*4882a593Smuzhiyun /*....................................... Connect and get your buffer */ 69*4882a593Smuzhiyun-- 70*4882a593Smuzhiyun2.1.0 71*4882a593Smuzhiyun 72