diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-06-06 15:55:19 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-06-06 15:55:19 +0000 |
| commit | f228a1e38bdb1227f86320ec87a220269c16ecd4 (patch) | |
| tree | fb257109bc84a10279eeb7683dec6105082389d7 | |
| parent | 3e29d370d34e36521af551ecdf668776ce05b07e (diff) | |
ncurses-4.2-990605
| -rw-r--r-- | lib/libcurses/tinfo/lib_napms.c | 10 | ||||
| -rw-r--r-- | lib/libcurses/tinfo/lib_tparm.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/libcurses/tinfo/lib_napms.c b/lib/libcurses/tinfo/lib_napms.c index d5dd07be396..f78b5149f19 100644 --- a/lib/libcurses/tinfo/lib_napms.c +++ b/lib/libcurses/tinfo/lib_napms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_napms.c,v 1.1 1999/01/18 19:10:18 millert Exp $ */ +/* $OpenBSD: lib_napms.c,v 1.2 1999/06/06 15:55:17 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -43,7 +43,9 @@ #include <curses.priv.h> -#if USE_FUNC_POLL +#if HAVE_NANOSLEEP +#include <time.h> +#elif USE_FUNC_POLL #include <stropts.h> #include <poll.h> #if HAVE_SYS_TIME_H @@ -56,9 +58,9 @@ #if HAVE_SYS_SELECT_H #include <sys/select.h> #endif -#endif +#endif -MODULE_ID("$From: lib_napms.c,v 1.4 1998/02/13 10:24:54 jbuhler Exp $") +MODULE_ID("$From: lib_napms.c,v 1.5 1999/06/06 00:42:47 R.Lindsay.Todd Exp $") int napms(int ms) { diff --git a/lib/libcurses/tinfo/lib_tparm.c b/lib/libcurses/tinfo/lib_tparm.c index 228ecdbfc6f..fa546352160 100644 --- a/lib/libcurses/tinfo/lib_tparm.c +++ b/lib/libcurses/tinfo/lib_tparm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_tparm.c,v 1.3 1999/05/13 03:01:47 aaron Exp $ */ +/* $OpenBSD: lib_tparm.c,v 1.4 1999/06/06 15:55:18 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -45,7 +45,7 @@ #include <term.h> #include <tic.h> -MODULE_ID("$From: lib_tparm.c,v 1.38 1999/02/27 20:08:22 tom Exp $") +MODULE_ID("$From: lib_tparm.c,v 1.39 1999/06/06 00:04:55 tom Exp $") /* * char * @@ -440,15 +440,13 @@ static int static_vars[NUM_VARS]; case '/': y = npop(); x = npop(); - if (y) - npush(x / y); + npush(y ? (x / y) : 0); break; case 'm': y = npop(); x = npop(); - if (y) - npush(x % y); + npush(y ? (x % y) : 0); break; case 'A': |