diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 285a256f57..6cf4407ff7 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.97 1999/03/28 20:32:01 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.98 1999/04/02 04:51:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,6 @@ static Portal vc_portal;
 static int	MESSAGE_LEVEL;		/* message level */
 
 static TransactionId	XmaxRecent;
-extern void		GetXmaxRecent(TransactionId *xid);
 
 #define swapLong(a,b)	{long tmp; tmp=a; a=b; b=tmp;}
 #define swapInt(a,b)	{int tmp; tmp=a; a=b; b=tmp;}
@@ -2421,16 +2420,16 @@ vc_find_eq(void *bot, int nelem, int size, void *elm,
 		}
 		if (last_move == true)
 		{
-			res = compar(elm, bot + last * size);
+			res = compar(elm, (void *)((char *)bot + last * size));
 			if (res > 0)
 				return NULL;
 			if (res == 0)
-				return bot + last * size;
+				return (void *)((char *)bot + last * size);
 			last_move = false;
 		}
-		res = compar(elm, bot + celm * size);
+		res = compar(elm, (void *)((char *)bot + celm * size));
 		if (res == 0)
-			return bot + celm * size;
+			return (void *)((char *)bot + celm * size);
 		if (res < 0)
 		{
 			if (celm == 0)
@@ -2445,7 +2444,7 @@ vc_find_eq(void *bot, int nelem, int size, void *elm,
 			return NULL;
 
 		last = last - celm - 1;
-		bot = bot + (celm + 1) * size;
+		bot = (void *)((char *)bot + (celm + 1) * size);
 		celm = (last + 1) / 2;
 		first_move = true;
 	}
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 55ecd85797..421cd399c6 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.38 1999/03/28 20:32:22 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.39 1999/04/02 04:51:03 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -737,5 +737,4 @@ GetXmaxRecent(TransactionId *XmaxRecent)
 
 	SpinRelease(ShmemIndexLock);
 	elog(ERROR, "GetXmaxRecent: ShmemIndex corrupted");
-	return NULL;
 }
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index f74ebe78ba..7f5ed84aac 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: shmem.h,v 1.15 1999/02/13 23:22:10 momjian Exp $
+ * $Id: shmem.h,v 1.16 1999/04/02 04:51:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -71,6 +71,7 @@ extern SHMEM_OFFSET ShmemPIDDestroy(int pid);
 extern long *ShmemInitStruct(char *name, unsigned long size,
 				bool *foundPtr);
 extern bool TransactionIdIsInProgress(TransactionId xid);
+extern void	GetXmaxRecent(TransactionId *XmaxRecent);
 
 
 typedef int TableID;