From ee113c26fbd5723c863282e8bbadfaf5d86a46b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Mon, 20 Jan 2020 13:04:15 -0300
Subject: [PATCH] Redirect some headers noticed by the compiler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
    1 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
/usr/include/sys/signal.h:1:2: warning: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Wcpp]
    1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h>

Note: <sys/signal.h> has been removed from the tdeio/tdeio/connection.cpp source - it was already declared.

Signed-off-by: Matías Fonzo <selk@dragora.org>
(cherry picked from commit c2adce2e133c167567df8607a32a420a9825f695)
---
 tdecore/network/tdesocketdevice.cpp | 2 +-
 tdeio/tdeio/connection.cpp          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp
index e4802bb7c..b97ad0ba0 100644
--- a/tdecore/network/tdesocketdevice.cpp
+++ b/tdecore/network/tdesocketdevice.cpp
@@ -39,7 +39,7 @@
 #include <unistd.h>
 
 #ifdef HAVE_POLL
-# include <sys/poll.h>
+# include <poll.h>
 #else
 # ifdef HAVE_SYS_SELECT
 #  include <sys/select.h>
diff --git a/tdeio/tdeio/connection.cpp b/tdeio/tdeio/connection.cpp
index fa316f56d..9577ad534 100644
--- a/tdeio/tdeio/connection.cpp
+++ b/tdeio/tdeio/connection.cpp
@@ -27,7 +27,6 @@
 #include <tqtimer.h>
 
 #include <sys/types.h>
-#include <sys/signal.h>
 #include <sys/time.h>
 
 #include <errno.h>