ncurses 5.9 - patch 20140412

[ncurses.git] / ncurses / tinfo / lib_napms.c

diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c
index 50c9eb2e1b51e7b04ed2a53a127b70f7b6feb72a..df17363dd42f65efd31f69fa3ff997d2ce756f91 100644 (file)
--- a/ncurses/tinfo/lib_napms.c
+++ b/ncurses/tinfo/lib_napms.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -51,33 +51,36 @@
 #endif
 #endif
 
-MODULE_ID("$Id: lib_napms.c,v 1.21 2011/06/04 19:24:16 tom Exp $")
+MODULE_ID("$Id: lib_napms.c,v 1.24 2014/03/08 20:32:59 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms)
 {
     T((T_CALLED("napms(%d)"), ms));
 
-    if (HasTerminal(SP_PARM)) {
 #ifdef USE_TERM_DRIVER
-       CallDriver_1(SP_PARM, nap, ms);
+    if (HasTerminal(SP_PARM)) {
+       CallDriver_1(SP_PARM, td_nap, ms);
+    }
 #else /* !USE_TERM_DRIVER */
+#if NCURSES_SP_FUNCS
+    (void) sp;
+#endif
 #if HAVE_NANOSLEEP
-       {
-           struct timespec request, remaining;
-           request.tv_sec = ms / 1000;
-           request.tv_nsec = (ms % 1000) * 1000000;
-           while (nanosleep(&request, &remaining) == -1
-                  && errno == EINTR) {
-               request = remaining;
-           }
+    {
+       struct timespec request, remaining;
+       request.tv_sec = ms / 1000;
+       request.tv_nsec = (ms % 1000) * 1000000;
+       while (nanosleep(&request, &remaining) == -1
+              && errno == EINTR) {
+           request = remaining;
        }
+    }
 #else
-       _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
+    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
 #endif
 #endif /* !USE_TERM_DRIVER */
 
-    }
     returnCode(OK);
 }