diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2022-07-24 09:32:34 +1200 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2022-07-24 09:32:34 +1200 |
| commit | fb12becdfb89e35f3f56768cefe1a837f0afafaf (patch) | |
| tree | eea26473ddbbd0284db10c287ac3a0a7c6167a22 /src | |
| parent | 86e5eb4f58a276870fbd29e3711b36e4a4280979 (diff) | |
| download | postgresql-fb12becdfb89e35f3f56768cefe1a837f0afafaf.tar.gz postgresql-fb12becdfb89e35f3f56768cefe1a837f0afafaf.zip | |
Remove dead handling for pre-POSIX sigwait().
sigwait() is in SUSv2 and all targeted Unix systems have it. An earlier
pre-standard function prototype existed on some older systems, but we
no longer need a workaround for that.
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Greg Stark <stark@mit.edu>
Reviewed-by: Robert Haas <robertmhaas@gmail.com>
Discussion: https://postgr.es/m/CA+hUKGJ3LHeP9w5Fgzdr4G8AnEtJ=z=p6hGDEm4qYGEUX5B6fQ@mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/command.c | 10 | ||||
| -rw-r--r-- | src/bin/psql/startup.c | 4 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 7 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 2 |
4 files changed, 7 insertions, 16 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 0955142215a..cac98804ab5 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -4953,7 +4953,7 @@ do_watch(PQExpBuffer query_buf, double sleep) FILE *pagerpipe = NULL; int title_len; int res = 0; -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 sigset_t sigalrm_sigchld_sigint; sigset_t sigalrm_sigchld; sigset_t sigint; @@ -4967,7 +4967,7 @@ do_watch(PQExpBuffer query_buf, double sleep) return false; } -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 sigemptyset(&sigalrm_sigchld_sigint); sigaddset(&sigalrm_sigchld_sigint, SIGCHLD); sigaddset(&sigalrm_sigchld_sigint, SIGALRM); @@ -5006,7 +5006,7 @@ do_watch(PQExpBuffer query_buf, double sleep) * PAGER environment variables, because traditional pagers probably won't * be very useful for showing a stream of results. */ -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 pagerprog = getenv("PSQL_WATCH_PAGER"); #endif if (pagerprog && myopt.topt.pager) @@ -5077,7 +5077,7 @@ do_watch(PQExpBuffer query_buf, double sleep) if (pagerpipe && ferror(pagerpipe)) break; -#ifndef HAVE_POSIX_DECL_SIGWAIT +#ifdef WIN32 /* * Set up cancellation of 'watch' via SIGINT. We redo this each time @@ -5158,7 +5158,7 @@ do_watch(PQExpBuffer query_buf, double sleep) fflush(stdout); } -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 /* Disable the interval timer. */ memset(&interval, 0, sizeof(interval)); setitimer(ITIMER_REAL, &interval, NULL); diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 7c2f555f15c..e2e5678e2d2 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -110,7 +110,7 @@ log_locus_callback(const char **filename, uint64 *lineno) } } -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 static void empty_signal_handler(SIGNAL_ARGS) { @@ -308,7 +308,7 @@ main(int argc, char *argv[]) psql_setup_cancel_handler(); -#ifdef HAVE_POSIX_DECL_SIGWAIT +#ifndef WIN32 /* * do_watch() needs signal handlers installed (otherwise sigwait() will diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 9061f301b05..bf42c541dc4 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -149,10 +149,6 @@ don't. */ #undef HAVE_DECL_RTLD_NOW -/* Define to 1 if you have the declaration of `sigwait', and to 0 if you - don't. */ -#undef HAVE_DECL_SIGWAIT - /* Define to 1 if you have the declaration of `strlcat', and to 0 if you don't. */ #undef HAVE_DECL_STRLCAT @@ -406,9 +402,6 @@ /* Define to 1 if you have the <poll.h> header file. */ #undef HAVE_POLL_H -/* Define to 1 if you have a POSIX-conforming sigwait declaration. */ -#undef HAVE_POSIX_DECL_SIGWAIT - /* Define to 1 if you have the `posix_fadvise' function. */ #undef HAVE_POSIX_FADVISE diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 5fa8626af7f..a71a24d435d 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -246,7 +246,6 @@ sub GenerateFiles HAVE_DECL_PWRITEV => 0, HAVE_DECL_RTLD_GLOBAL => 0, HAVE_DECL_RTLD_NOW => 0, - HAVE_DECL_SIGWAIT => 0, HAVE_DECL_STRLCAT => 0, HAVE_DECL_STRLCPY => 0, HAVE_DECL_STRNLEN => 1, @@ -329,7 +328,6 @@ sub GenerateFiles HAVE_PAM_PAM_APPL_H => undef, HAVE_POLL => undef, HAVE_POLL_H => undef, - HAVE_POSIX_DECL_SIGWAIT => undef, HAVE_POSIX_FADVISE => undef, HAVE_POSIX_FALLOCATE => undef, HAVE_PPC_LWARX_MUTEX_HINT => undef, |