X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_napms.c;h=e1a0587028ed75e78b8f47542d42840299fe6d42;hp=50c9eb2e1b51e7b04ed2a53a127b70f7b6feb72a;hb=06078d3fa68db669ed37178c01873546b4b28745;hpb=331f875facea2b7897c1ce0425ce0d111cc4175b;ds=sidebyside

diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c
index 50c9eb2e..e1a05870 100644
--- 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-2014,2017 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,34 @@
 #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.25 2017/07/01 21:05:56 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);
+    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);
 }