Cleanup for Win32 pgkill.

diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
index 25786cfdc051d6fb98c1c4f521834fadea4d23c4..fc0652a5b01b069e0b66579d18a67ffb94df1eb0 100644 (file)
--- a/src/backend/port/win32/signal.c
+++ b/src/backend/port/win32/signal.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
  * 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 @@
 static CRITICAL_SECTION pg_signal_crit_sec;
 static int     pg_signal_queue;
 
-#define PG_SIGNAL_COUNT 32
 static pqsigfunc pg_signal_array[PG_SIGNAL_COUNT];
 static pqsigfunc pg_signal_defaults[PG_SIGNAL_COUNT];
 static int     pg_signal_mask;

diff --git a/src/include/port.h b/src/include/port.h
index 1357984afbb8afd9dd2f35f320269c5a94c1d3ce..907fb20a43bd7d0361dd7a9db55275ed90800e11 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * 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);
 extern int pgpipe(int handles[2]);
 extern int piperead(int s, char* buf, int len);
 #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
+
 extern int pclose_check(FILE *stream);
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 851516ba8504c35c574cc9e599616d68ef15721d..c10eb078c4a8a4c88226966ffea018de2a3a1052 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $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 */
 #undef mkdir
@@ -116,9 +116,6 @@ void pg_queue_signal(int signum);
 #define SIG_ERR ((pqsigfunc)-1)
 #define SIG_IGN ((pqsigfunc)1)
 
-#define kill(pid,sig)   pgkill(pid,sig)
-extern int pgkill(int pid, int sig);
-
 #ifndef FRONTEND
 #define pg_usleep(t) pgwin32_backend_usleep(t)
 void pgwin32_backend_usleep(long microsec);