1From: Maarten ter Huurne <maarten@treewalker.org> 2Date: Mon, 15 Sep 2014 00:24:41 +0200 3Subject: Renamed sched.h to eventqueue.h 4 5There is a <sched.h> system header that got shadowed by "sched.h". 6While Screen itself doesn't include <sched.h>, other system headers 7might include it indirectly. This broke the build when using uClibc 8with pthread support. 9 10Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> 11--- 12 eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 13 sched.h | 48 ------------------------------------------------ 14 screen.h | 2 +- 15 3 files changed, 49 insertions(+), 49 deletions(-) 16 create mode 100644 eventqueue.h 17 delete mode 100644 sched.h 18 19diff --git a/eventqueue.h b/eventqueue.h 20new file mode 100644 21index 0000000..fdc3fc4 22--- /dev/null 23+++ b/eventqueue.h 24@@ -0,0 +1,48 @@ 25+/* Copyright (c) 2008, 2009 26+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) 27+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) 28+ * Micah Cowan (micah@cowan.name) 29+ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) 30+ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 31+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) 32+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) 33+ * Copyright (c) 1987 Oliver Laumann 34+ * 35+ * This program is free software; you can redistribute it and/or modify 36+ * it under the terms of the GNU General Public License as published by 37+ * the Free Software Foundation; either version 3, or (at your option) 38+ * any later version. 39+ * 40+ * This program is distributed in the hope that it will be useful, 41+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 42+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 43+ * GNU General Public License for more details. 44+ * 45+ * You should have received a copy of the GNU General Public License 46+ * along with this program (see the file COPYING); if not, see 47+ * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., 48+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA 49+ * 50+ **************************************************************** 51+ * $Id$ GNU 52+ */ 53+ 54+struct event 55+{ 56+ struct event *next; 57+ void (*handler) __P((struct event *, char *)); 58+ char *data; 59+ int fd; 60+ int type; 61+ int pri; 62+ struct timeval timeout; 63+ int queued; /* in evs queue */ 64+ int active; /* in fdset */ 65+ int *condpos; /* only active if condpos - condneg > 0 */ 66+ int *condneg; 67+}; 68+ 69+#define EV_TIMEOUT 0 70+#define EV_READ 1 71+#define EV_WRITE 2 72+#define EV_ALWAYS 3 73diff --git a/sched.h b/sched.h 74deleted file mode 100644 75index fdc3fc4..0000000 76--- a/sched.h 77+++ /dev/null 78@@ -1,48 +0,0 @@ 79-/* Copyright (c) 2008, 2009 80- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) 81- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) 82- * Micah Cowan (micah@cowan.name) 83- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) 84- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 85- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) 86- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) 87- * Copyright (c) 1987 Oliver Laumann 88- * 89- * This program is free software; you can redistribute it and/or modify 90- * it under the terms of the GNU General Public License as published by 91- * the Free Software Foundation; either version 3, or (at your option) 92- * any later version. 93- * 94- * This program is distributed in the hope that it will be useful, 95- * but WITHOUT ANY WARRANTY; without even the implied warranty of 96- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 97- * GNU General Public License for more details. 98- * 99- * You should have received a copy of the GNU General Public License 100- * along with this program (see the file COPYING); if not, see 101- * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., 102- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA 103- * 104- **************************************************************** 105- * $Id$ GNU 106- */ 107- 108-struct event 109-{ 110- struct event *next; 111- void (*handler) __P((struct event *, char *)); 112- char *data; 113- int fd; 114- int type; 115- int pri; 116- struct timeval timeout; 117- int queued; /* in evs queue */ 118- int active; /* in fdset */ 119- int *condpos; /* only active if condpos - condneg > 0 */ 120- int *condneg; 121-}; 122- 123-#define EV_TIMEOUT 0 124-#define EV_READ 1 125-#define EV_WRITE 2 126-#define EV_ALWAYS 3 127diff --git a/screen.h b/screen.h 128index 603ca3f..34238c8 100644 129--- a/screen.h 130+++ b/screen.h 131@@ -43,7 +43,7 @@ 132 #include "osdef.h" 133 134 #include "ansi.h" 135-#include "sched.h" 136+#include "eventqueue.h" 137 #include "acls.h" 138 #include "comm.h" 139 #include "layer.h" 140-- 1411.8.4.5 142 143