diff options
Diffstat (limited to 'src/bin/psql/common.h')
| -rw-r--r-- | src/bin/psql/common.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h index 4cf5da0bf35..6045b7587d8 100644 --- a/src/bin/psql/common.h +++ b/src/bin/psql/common.h @@ -3,14 +3,13 @@ * * Copyright (c) 2000-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.h,v 1.49 2006/06/01 00:15:36 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/psql/common.h,v 1.50 2006/06/14 16:49:02 tgl Exp $ */ #ifndef COMMON_H #define COMMON_H #include "postgres_fe.h" -#include <signal.h> -#include "pqsignal.h" +#include <setjmp.h> #include "libpq-fe.h" #ifdef USE_ASSERT_CHECKING @@ -41,16 +40,17 @@ __attribute__((format(printf, 1, 2))); extern void NoticeProcessor(void *arg, const char *message); -extern volatile bool cancel_pressed; +extern volatile bool sigint_interrupt_enabled; -extern void ResetCancelConn(void); +extern sigjmp_buf sigint_interrupt_jmp; + +extern volatile bool cancel_pressed; +/* Note: cancel_pressed is defined in print.c, see that file for reasons */ -#ifndef WIN32 -extern void handle_sigint(SIGNAL_ARGS); -#else -extern void setup_win32_locks(void); extern void setup_cancel_handler(void); -#endif + +extern void SetCancelConn(void); +extern void ResetCancelConn(void); extern PGresult *PSQLexec(const char *query, bool start_xact); |