Commit 83526ccf authored by Bruce Momjian's avatar Bruce Momjian

Cleanup for Win32 pgkill.

parent 6f21f4ad
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.2 2004/05/27 13:08:50 momjian Exp $ * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.3 2004/05/27 14:39:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
static CRITICAL_SECTION pg_signal_crit_sec; static CRITICAL_SECTION pg_signal_crit_sec;
static int pg_signal_queue; static int pg_signal_queue;
#define PG_SIGNAL_COUNT 32
static pqsigfunc pg_signal_array[PG_SIGNAL_COUNT]; static pqsigfunc pg_signal_array[PG_SIGNAL_COUNT];
static pqsigfunc pg_signal_defaults[PG_SIGNAL_COUNT]; static pqsigfunc pg_signal_defaults[PG_SIGNAL_COUNT];
static int pg_signal_mask; static int pg_signal_mask;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/port.h,v 1.38 2004/05/25 01:00:28 momjian Exp $ * $PostgreSQL: pgsql/src/include/port.h,v 1.39 2004/05/27 14:39:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -101,7 +101,12 @@ extern off_t ftello(FILE *stream); ...@@ -101,7 +101,12 @@ extern off_t ftello(FILE *stream);
extern int pgpipe(int handles[2]); extern int pgpipe(int handles[2]);
extern int piperead(int s, char* buf, int len); extern int piperead(int s, char* buf, int len);
#define pipewrite(a,b,c) send(a,b,c,0) #define pipewrite(a,b,c) send(a,b,c,0)
#define PG_SIGNAL_COUNT 32
#define kill(pid,sig) pgkill(pid,sig)
extern int pgkill(int pid, int sig);
#endif #endif
extern int pclose_check(FILE *stream); extern int pclose_check(FILE *stream);
#if defined(__MINGW32__) || defined(__CYGWIN__) #if defined(__MINGW32__) || defined(__CYGWIN__)
......
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.24 2004/05/27 13:08:54 momjian Exp $ */ /* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.25 2004/05/27 14:39:33 momjian Exp $ */
/* undefine and redefine after #include */ /* undefine and redefine after #include */
#undef mkdir #undef mkdir
...@@ -116,9 +116,6 @@ void pg_queue_signal(int signum); ...@@ -116,9 +116,6 @@ void pg_queue_signal(int signum);
#define SIG_ERR ((pqsigfunc)-1) #define SIG_ERR ((pqsigfunc)-1)
#define SIG_IGN ((pqsigfunc)1) #define SIG_IGN ((pqsigfunc)1)
#define kill(pid,sig) pgkill(pid,sig)
extern int pgkill(int pid, int sig);
#ifndef FRONTEND #ifndef FRONTEND
#define pg_usleep(t) pgwin32_backend_usleep(t) #define pg_usleep(t) pgwin32_backend_usleep(t)
void pgwin32_backend_usleep(long microsec); void pgwin32_backend_usleep(long microsec);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment