diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index fc909fe7aa933d753f5fea2ff33a86ccf3407214..f0d9e3b1affa6449ed7750f70cebb1411d169fa1 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.1.1.1 1996/07/09 06:21:33 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.2 1996/07/31 02:18:48 scrappy Exp $
  *
  * NOTES
  *    Most of the read functions for plan nodes are tested. (In fact, they
@@ -1185,8 +1185,8 @@ _readRangeTblEntry()
 	token++;
 	token[length - 2] = '\0';
 	
-	local_node->relname = (Name) palloc(NAMEDATALEN);
-	namestrcpy(local_node->relname, token);
+	local_node->relname = (char *) palloc(NAMEDATALEN);
+	strcpy(local_node->relname, token);
 	token[length - 2] = '\"';
     }
 
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 74651996d9ce743697987492049010e9a209c9fa..6f8ce2cc99489f51e4b6b8357b36719706b865ba 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *      This is so that we can support more backends. (system-wide semaphore
  *      sets run out pretty fast.)                -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $
  */
 #include <sys/time.h>
 #ifndef WIN32
@@ -96,7 +96,7 @@ static void ProcKill(int exitStatus, int pid);
 static void ProcGetNewSemKeyAndNum(IPCKey *key, int *semNum);
 static void ProcFreeSem(IpcSemaphoreKey semKey, int semNum);
 #if defined(PORTNAME_linux)
-extern int HandleDeadLock(int);
+extern void HandleDeadLock(int);
 #else
 extern int HandleDeadLock(void);
 #endif
@@ -628,10 +628,11 @@ ProcAddLock(SHM_QUEUE *elem)
  * up my semaphore.
  * --------------------
  */
-int
 #if defined(PORTNAME_linux)
+void 
 HandleDeadLock(int i)
 #else
+int 
 HandleDeadLock()
 #endif
 {
diff --git a/src/bin/pg_version/pg_version.c b/src/bin/pg_version/pg_version.c
index 6844692be7e7d42e0e244685149de6fa7ea8f4f0..4b9b7abc7a1d49c08b2362ed3d0289f42ff253bf 100644
--- a/src/bin/pg_version/pg_version.c
+++ b/src/bin/pg_version/pg_version.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.1.1.1 1996/07/09 06:22:14 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.2 1996/07/31 02:19:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,5 +31,5 @@ elog() {}
 
 GetDataHome()
 {
-	return(NULL);
+	return(0);
 }