Merge from emacs--devo--0

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index dd13e3764aa2cb62c3d5be2d0dd865a71b189765..cc2212d5e19e45776c5daef2ac8479a204a3efe9 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,5 +1,6 @@
 /* syssignal.h - System-dependent definitions for signals.
-   Copyright (C) 1993, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1999, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -145,7 +146,10 @@ extern SIGMASKTYPE sigprocmask_set;
 #undef SIGINFO
 #endif
 #if defined (SIGIO) && defined (BROKEN_SIGIO)
-#undef SIGIO
+# undef SIGIO
+# if defined (__Lynx__)
+# undef SIGPOLL /* Defined as SIGIO on LynxOS */
+# endif
 #endif
 #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL)
 #undef SIGPOLL