diff options
| author | Oliver Kiddle <opk@zsh.org> | 2023-05-21 03:36:21 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2023-05-21 03:36:26 +0200 |
| commit | f80ad32c3f4e6239d9d6853d14ff36e28154f075 (patch) | |
| tree | b11f44f9ae0dee8d9d3ee25e538fa4cde8710cb6 | |
| parent | b41dd30c90a90dd28c551af7e7f76ae29b6220d0 (diff) | |
| download | zsh-f80ad32c3f4e6239d9d6853d14ff36e28154f075.tar.gz zsh-f80ad32c3f4e6239d9d6853d14ff36e28154f075.tar.xz zsh-f80ad32c3f4e6239d9d6853d14ff36e28154f075.zip | |
51769: fix compilation when HAVE_GETRUSAGE is not defined
Also silence compiler warning when HAVE_SETUPTERM is not defined.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/jobs.c | 2 | ||||
| -rw-r--r-- | Src/utils.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e43613070..0b2993f7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2023-05-21 Oliver Kiddle <opk@zsh.org> + * 51769: Src/jobs.c, Src/utils.c: fix compilation when + HAVE_GETRUSAGE is not defined + * Marlon Richert: 51761: Completion/Zsh/Type/_parameters: Use zstyle verbose for _parameters descriptions diff --git a/Src/jobs.c b/Src/jobs.c index 4d7172550..dd7bba405 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -1032,7 +1032,7 @@ should_report_time(Job j) return 1; #else { - clktck = get_clktck(); + long clktck = get_clktck(); if ((j->procs->ti.ut + j->procs->ti.st) / clktck >= reporttime) return 1; } diff --git a/Src/utils.c b/Src/utils.c index 14ff0ed47..f13e3a79d 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -380,11 +380,13 @@ zerrmsg(FILE *file, const char *fmt, va_list ap) fflush(file); } +#ifdef HAVE_SETUPTERM /* * Wrapper for setupterm() and del_curterm(). * These are called from terminfo.c and termcap.c. */ static int term_count; /* reference count of cur_term */ +#endif /**/ mod_export void |