2008-08-10  Pedro Alves  <address@hidden>

	* signals.c (rl_set_sighandler): Guard access to SIGWINCH.
	* wcwidth.c [__GO32__]: Include wctype.h before wchar.h.

---
 signals.c         |    4 ++++
 support/wcwidth.c |    5 +++++
 2 files changed, 9 insertions(+)

Index: readline-5.2/signals.c
===================================================================
--- readline-5.2.orig/signals.c	2005-12-24 02:46:43.000000000 +0000
+++ readline-5.2/signals.c	2008-08-10 16:10:33.000000000 +0100
@@ -252,7 +252,11 @@ rl_set_sighandler (sig, handler, ohandle
   struct sigaction act;
 
   act.sa_handler = handler;
+#if defined (SIGWINCH)
   act.sa_flags = (sig == SIGWINCH) ? SA_RESTART : 0;
+#else
+  act.sa_flags = 0;
+#endif
   sigemptyset (&act.sa_mask);
   sigemptyset (&ohandler->sa_mask);
   sigaction (sig, &act, &old_handler);
Index: readline-5.2/support/wcwidth.c
===================================================================
--- readline-5.2.orig/support/wcwidth.c	2002-01-10 13:36:26.000000000 +0000
+++ readline-5.2/support/wcwidth.c	2008-08-10 16:10:33.000000000 +0100
@@ -6,6 +6,11 @@
  * Markus Kuhn -- 2001-09-08 -- public domain
  */
 
+#ifdef __GO32__
+/* DJGPP needs to include this before including wchar.h.  */
+# include <wctype.h>
+#endif
+
 #include <wchar.h>
 
 struct interval {