1*4882a593SmuzhiyunFrom 1072d60c6c8f1f51feb740527a8a056bfead9318 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Seiderer <ps.report@gmx.net> 3*4882a593SmuzhiyunDate: Thu, 8 Oct 2015 19:53:47 +0200 4*4882a593SmuzhiyunSubject: [PATCH] fbio.cpp, improxy.cpp, fbterm.cpp: fix musl compile 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun- add missing include, fixes: 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun fbio.cpp:33:8: error: ‘fd_set’ does not name a type 12*4882a593Smuzhiyun static fd_set fds; 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun improxy.cpp:439:3: error: ‘fd_set’ was not declared in this scope 15*4882a593Smuzhiyun 16*4882a593Smuzhiyun- add missing WAIT_ANY define, fixes: 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun fbterm.cpp: In member function ‘void FbTerm::processSignal(u32)’: 19*4882a593Smuzhiyun fbterm.cpp:212:22: error: ‘WAIT_ANY’ was not declared in this scope 20*4882a593Smuzhiyun s32 pid = waitpid(WAIT_ANY, 0, WNOHANG); 21*4882a593Smuzhiyun 22*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun src/fbio.cpp | 1 + 25*4882a593Smuzhiyun src/fbterm.cpp | 4 ++++ 26*4882a593Smuzhiyun src/improxy.cpp | 1 + 27*4882a593Smuzhiyun 3 files changed, 6 insertions(+) 28*4882a593Smuzhiyun 29*4882a593Smuzhiyundiff --git a/src/fbio.cpp b/src/fbio.cpp 30*4882a593Smuzhiyunindex e5afc44..88c632c 100644 31*4882a593Smuzhiyun--- a/src/fbio.cpp 32*4882a593Smuzhiyun+++ b/src/fbio.cpp 33*4882a593Smuzhiyun@@ -30,6 +30,7 @@ 34*4882a593Smuzhiyun #define NR_EPOLL_FDS 10 35*4882a593Smuzhiyun s32 epollFd; 36*4882a593Smuzhiyun #else 37*4882a593Smuzhiyun+#include <sys/select.h> 38*4882a593Smuzhiyun static fd_set fds; 39*4882a593Smuzhiyun static u32 maxfd = 0; 40*4882a593Smuzhiyun #endif 41*4882a593Smuzhiyundiff --git a/src/fbterm.cpp b/src/fbterm.cpp 42*4882a593Smuzhiyunindex 38d4014..60288e4 100644 43*4882a593Smuzhiyun--- a/src/fbterm.cpp 44*4882a593Smuzhiyun+++ b/src/fbterm.cpp 45*4882a593Smuzhiyun@@ -37,6 +37,10 @@ 46*4882a593Smuzhiyun #include "input_key.h" 47*4882a593Smuzhiyun #include "mouse.h" 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun+#ifndef WAIT_ANY 50*4882a593Smuzhiyun+#define WAIT_ANY (-1) 51*4882a593Smuzhiyun+#endif 52*4882a593Smuzhiyun+ 53*4882a593Smuzhiyun #ifdef HAVE_SIGNALFD 54*4882a593Smuzhiyun // <sys/signalfd.h> offered by some systems has bug with g++ 55*4882a593Smuzhiyun #include "signalfd.h" 56*4882a593Smuzhiyundiff --git a/src/improxy.cpp b/src/improxy.cpp 57*4882a593Smuzhiyunindex 3d03e66..4e046d2 100644 58*4882a593Smuzhiyun--- a/src/improxy.cpp 59*4882a593Smuzhiyun+++ b/src/improxy.cpp 60*4882a593Smuzhiyun@@ -23,6 +23,7 @@ 61*4882a593Smuzhiyun #include <stdio.h> 62*4882a593Smuzhiyun #include <string.h> 63*4882a593Smuzhiyun #include <errno.h> 64*4882a593Smuzhiyun+#include <sys/select.h> 65*4882a593Smuzhiyun #include <sys/socket.h> 66*4882a593Smuzhiyun #include "improxy.h" 67*4882a593Smuzhiyun #include "immessage.h" 68*4882a593Smuzhiyun-- 69*4882a593Smuzhiyun2.1.4 70*4882a593Smuzhiyun 71