3 files changed, 26 insertions, 6 deletions
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index 9267fdbbf04..de9b9dc3c7c 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: async.h,v 1.15 2000/08/27 19:00:41 petere Exp $
+ * $Id: async.h,v 1.16 2000/08/29 09:36:50 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@ extern void AtCommit_Notify(void);
 extern void AtAbort_Notify(void);
 
 /* signal handler for inbound notifies (SIGUSR2) */
-extern void Async_NotifyHandler(int signum);
+extern void Async_NotifyHandler(SIGNAL_ARGS);
 
 /*
  * enable/disable processing of inbound notifies directly from signal handler.
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 4101d8d2114..21ebcaf2297 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.133 2000/08/27 19:00:39 petere Exp $
+ * $Id: config.h.in,v 1.134 2000/08/29 09:36:49 petere Exp $
  */
 
 #ifndef CONFIG_H
@@ -300,6 +300,12 @@
 /* Define as your compiler's spelling of "inline", or empty if no inline. */
 #undef inline
 
+/* Define as empty if the C compiler doesn't understand "signed". */
+#undef signed
+
+/* Define as empty if the C compiler doesn't understand "volatile". */
+#undef volatile
+
 /* Define if your cpp understands the ANSI stringizing operators in macros */
 #undef HAVE_STRINGIZE
 
@@ -582,4 +588,18 @@ extern void srandom(unsigned int seed);
 
 #include "os.h"
 
+/*
+ * The following is used as the arg list for signal handlers.  Any ports
+ * that take something other than an int argument should override this in
+ * the port-specific os.h file.  Note that variable names are required
+ * because it is used in both the prototypes as well as the definitions.
+ * Note also the long name.  We expect that this won't collide with
+ * other names causing compiler warnings.
+ */ 
+
+#ifndef SIGNAL_ARGS
+#define SIGNAL_ARGS  int postgres_signal_arg
+#endif
+
+
 #endif /* CONFIG_H */
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 2a45461dff9..11e3a2ca5d2 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.32 2000/08/27 19:00:41 petere Exp $
+ * $Id: tcopprot.h,v 1.33 2000/08/29 09:36:51 petere Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -41,8 +41,8 @@ extern void pg_exec_query_dest(char *query_string,
 
 #endif	 /* BOOTSTRAP_INCLUDE */
 
-extern void handle_warn(int signum);
-extern void die(int signum);
+extern void handle_warn(SIGNAL_ARGS);
+extern void die(SIGNAL_ARGS);
 extern void CancelQuery(void);
 extern int PostgresMain(int argc, char *argv[],
 			 int real_argc, char *real_argv[]);