Build fixes for DJGPP.

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

diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 1a1dfc980762330f6cbd46aea3ff11d9fab52a7e..be626e56d1a8e8d86f2f16a522e86683ed09cb0f 100644 (file)
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,10 @@
+2008-08-10  Pedro Alves  <pedro@codesourcery.com>
+
+       Build fixes for DJGPP.
+
+       * signals.c (rl_set_sighandler): Guard access to SIGWINCH.
+       * wcwidth.c [__GO32__]: Include wctype.h before wchar.h.
+
 2008-03-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        PR gdb/544

diff --git a/readline/signals.c b/readline/signals.c
index f344ed834975244d880e7c5d052e5c754afed2cd..2dca03f35b5d775ed8388d1672224764d65a5185 100644 (file)
--- a/readline/signals.c
+++ b/readline/signals.c
@@ -251,7 +251,11 @@ rl_set_sighandler (sig, handler, ohandler)
   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);

diff --git a/readline/support/wcwidth.c b/readline/support/wcwidth.c
index ace9a3ab92c00fed06c93d21c3ad1cf419a60f78..36433d7935b87bdbf7c25d8703a520774c93b17b 100644 (file)
--- a/readline/support/wcwidth.c
+++ b/readline/support/wcwidth.c
@@ -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 {