diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 28793522c0860b24382b89b3ae440a2cb9b5019d..60d998814d1c18788bbccbe5ddf0d8cb07cb7269 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.91 1998/06/27 13:24:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.92 1998/06/27 14:06:40 momjian Exp $
  *
  * NOTES
  *
@@ -1032,7 +1032,7 @@ CleanupProc(int pid,
 		if (DebugLvl)
 			fprintf(stderr, "%s: CleanupProc: reinitializing shared memory and semaphores\n",
 					progname);
-		shmem_exit();
+		shmem_exit(0);
 		reset_shared(PostPortName);
 	}
 }
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 6bf0a500a31e864b41f287733ad33a48226d9d65..48b563986ed16e02e7dd183da87ba4004c47a148 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.23 1998/06/27 04:53:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.24 1998/06/27 14:06:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -490,12 +490,9 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
 
 	if (!BindingTable)
 	{
-		/* Assert() is a macro now. substitutes inside quotes. */
 #ifdef USE_ASSERT_CHECKING
 		char	   *strname = "BindingTable";
-
 #endif
-
 		/*
 		 * If the binding table doesnt exist, we fake it.
 		 *
@@ -531,7 +528,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
 
 	if (!result)
 	{
-
 		SpinRelease(BindingLock);
 
 		elog(ERROR, "ShmemInitStruct: Binding Table corrupted");
@@ -540,7 +536,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
 	}
 	else if (*foundPtr)
 	{
-
 		/*
 		 * Structure is in the binding table so someone else has allocated
 		 * it already.	The size better be the same as the size we are
@@ -558,7 +553,6 @@ ShmemInitStruct(char *name, unsigned long size, bool *foundPtr)
 	}
 	else
 	{
-
 		/* It isn't in the table yet. allocate and initialize it */
 		structPtr = ShmemAlloc((long) size);
 		if (!structPtr)