diff --git a/readline/signals.c b/readline/signals.c
index 3a34432f14..40e09121c5 100644
--- a/readline/signals.c
+++ b/readline/signals.c
@@ -40,9 +40,9 @@
 #  include <sys/ioctl.h>
 #endif /* GWINSZ_IN_SYS_IOCTL */
 
-#if defined (__GO32__)
+#if defined (__GO32__) && !defined(__DJGPP__)
 #  undef HANDLE_SIGNALS
-#endif /* __GO32__ */
+#endif /* __GO32__  && !__DJGPP__ */
 
 #if defined (HANDLE_SIGNALS)
 /* Some standard library routines. */
@@ -93,7 +93,9 @@ int rl_catch_sigwinch = 1;
 #endif
 
 static int signals_set_flag;
+#ifdef SIGWINCH
 static int sigwinch_set_flag;
+#endif
 
 /* **************************************************************** */
 /*					        		    */