0005-rename-sched_h.patch 4.7 KB

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