diff --git a/c/unix/event.c b/c/unix/event.c
index 48a5802..fb46fd6 100644
--- a/c/unix/event.c
+++ b/c/unix/event.c
@@ -61,9 +61,8 @@ s48_sysdep_init(void)
 #ifdef SIGIO		     
   s48_setcatcher(SIGIO,     when_scsh_interrupt);
 #endif
-#if defined SIGPOLL && defined SIGIO && SIGPOLL != SIGIO
-  s48_setcatcher(SIGPOLL,   when_scsh_interrupt);
-#elseif defined SIGPOLL && !defined SIGIO
+#if defined SIGPOLL && ((defined SIGIO && SIGPOLL != SIGIO) ||	\
+			 !defined SIGIO)
   s48_setcatcher(SIGPOLL,   when_scsh_interrupt);
 #endif
 #ifdef SIGPROF	   
diff --git a/scsh/scsh_aux.c b/scsh/scsh_aux.c
index a516a26..c7be197 100644
--- a/scsh/scsh_aux.c
+++ b/scsh/scsh_aux.c
@@ -25,9 +25,8 @@ int main(int argc, char* argv[]){
 #ifdef SIGIO
   case SIGIO     : printf("scshint_io"); break;
 #endif
-#if defined SIGPOLL && defined SIGIO && SIGPOLL != SIGIO
-     case SIGPOLL   : printf("scshint_poll"); break;
-#elseif defined SIGPOLL && !defined SIGIO
+#if defined SIGPOLL && ((defined SIGIO && SIGPOLL != SIGIO) || \
+                         !defined SIGIO)
      case SIGPOLL   : printf("scshint_poll"); break;
 #endif
 #ifdef SIGPROF