From 23057f51f5c1bb1bcb93bd2879eefd9ceec1d744 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Mon, 17 Mar 2008 11:50:27 +0000
Subject: [PATCH] Move ProcState definition into sinvaladt.c from sinvaladt.h,
 since it's not needed anywhere after my previous patch.  Noticed by Tom Lane.

Also, remove #include <signal.h> from sinval.c.
---
 src/backend/storage/ipc/sinval.c    |  4 +---
 src/backend/storage/ipc/sinvaladt.c |  9 ++++++++-
 src/include/storage/sinvaladt.h     | 31 ++++++++++-------------------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index 6bf7ecdde8..4b8a8f1afb 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -8,14 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.84 2008/03/16 19:47:33 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.85 2008/03/17 11:50:26 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <signal.h>
-
 #include "access/xact.h"
 #include "commands/async.h"
 #include "miscadmin.h"
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 7c4956ae60..485506a162 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.67 2008/03/16 19:47:33 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.68 2008/03/17 11:50:27 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,6 +64,13 @@
 #define MAXNUMMESSAGES 4096
 #define MSGNUMWRAPAROUND (MAXNUMMESSAGES * 4096)
 
+/* Per-backend state in shared invalidation structure */
+typedef struct ProcState
+{
+	/* nextMsgNum is -1 in an inactive ProcState array entry. */
+	int			nextMsgNum;		/* next message number to read, or -1 */
+	bool		resetState;		/* true, if backend has to reset its state */
+} ProcState;
 
 /* Shared cache invalidation memory segment */
 typedef struct SISeg
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 012ce2d92c..8535cba0f0 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -3,20 +3,6 @@
  * sinvaladt.h
  *	  POSTGRES shared cache invalidation segment definitions.
  *
- *
- * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $PostgreSQL: pgsql/src/include/storage/sinvaladt.h,v 1.46 2008/03/16 19:47:34 alvherre Exp $
- *
- *-------------------------------------------------------------------------
- */
-#ifndef SINVALADT_H
-#define SINVALADT_H
-
-#include "storage/sinval.h"
-
-/*
  * The shared cache invalidation manager is responsible for transmitting
  * invalidation messages between backends.	Any message sent by any backend
  * must be delivered to all already-running backends before it can be
@@ -24,15 +10,18 @@
  * 
  * The struct type SharedInvalidationMessage, defining the contents of
  * a single message, is defined in sinval.h.
+ *
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * $PostgreSQL: pgsql/src/include/storage/sinvaladt.h,v 1.47 2008/03/17 11:50:27 alvherre Exp $
+ *
+ *-------------------------------------------------------------------------
  */
+#ifndef SINVALADT_H
+#define SINVALADT_H
 
-/* Per-backend state in shared invalidation structure */
-typedef struct ProcState
-{
-	/* nextMsgNum is -1 in an inactive ProcState array entry. */
-	int			nextMsgNum;		/* next message number to read, or -1 */
-	bool		resetState;		/* true, if backend has to reset its state */
-} ProcState;
+#include "storage/sinval.h"
 
 
 /*