X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_napms.c;h=80b3258da71c36b4c562f3e5f21e91e9c3e51c83;hp=50c9eb2e1b51e7b04ed2a53a127b70f7b6feb72a;hb=85b1a478852e6473f6f698af5f6fca055f43f21c;hpb=ba39fbc2e0cee4681395df4079d9e61c27262132;ds=inline diff --git a/ncurses/tinfo/lib_napms.c b/ncurses/tinfo/lib_napms.c index 50c9eb2e..80b3258d 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-2011,2012 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,33 @@ #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.22 2012/03/17 21:14:51 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 + if (HasTerminal(SP_PARM)) { CallDriver_1(SP_PARM, nap, ms); + } #else /* !USE_TERM_DRIVER */ #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); }