diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index ffd15225cf..35f07e6185 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.24 1999/02/21 03:48:28 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.25 1999/03/30 01:37:21 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -174,8 +174,7 @@ TransactionLogTest(TransactionId transactionId, /* transaction id to test */
 	{
 		TransactionIdStore(transactionId, &cachedTestXid);
 		cachedTestXidStatus = xidstatus;
-		return (bool)
-			(status == xidstatus);
+		return (bool) (status == xidstatus);
 	}
 
 	/* ----------------
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index d6be0ac033..a12b1ade28 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.20 1999/02/13 23:14:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.21 1999/03/30 01:37:21 momjian Exp $
  *
  * NOTES
  *	  This file contains support functions for the high
@@ -211,8 +211,7 @@ TransBlockGetXidStatus(Block tblock,
 	 *	return the transaction status to the caller
 	 * ----------------
 	 */
-	return (XidStatus)
-		(bit1 | bit2);
+	return (XidStatus) (bit1 | bit2);
 }
 
 /* --------------------------------
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 119343d3aa..9f2d7b4317 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.41 1999/03/23 05:40:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.42 1999/03/30 01:37:22 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -71,8 +71,7 @@ PortalCleanup(Portal portal)
 	 * ----------------
 	 */
 	context = MemoryContextSwitchTo((MemoryContext) PortalGetHeapMemory(portal));
-	PortalExecutorHeapMemory = (MemoryContext)
-		PortalGetHeapMemory(portal);
+	PortalExecutorHeapMemory = (MemoryContext) PortalGetHeapMemory(portal);
 
 	/* ----------------
 	 *	tell the executor to shutdown the query
@@ -210,7 +209,7 @@ PerformPortalFetch(char *name,
 	 * ----------------
 	 */
 	MemoryContextSwitchTo(
-			 (MemoryContext) PortalGetHeapMemory(GetPortalByName(NULL)));
+				(MemoryContext) PortalGetHeapMemory(GetPortalByName(NULL)));
 }
 
 /* --------------------------------
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 519d119bdc..d3064128a4 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -3,7 +3,7 @@
  * spi.c
  *				Server Programming Interface
  *
- * $Id: spi.c,v 1.35 1999/03/09 13:39:00 scrappy Exp $
+ * $Id: spi.c,v 1.36 1999/03/30 01:37:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,7 +49,7 @@ extern void ShowUsage(void);
 int
 SPI_connect()
 {
-	char									pname[64];
+	char					pname[64];
 	PortalVariableMemory	pvmem;
 
 	/*
diff --git a/src/include/c.h b/src/include/c.h
index b73396f92f..d3a2a0eea4 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.52 1999/03/09 13:39:01 scrappy Exp $
+ * $Id: c.h,v 1.53 1999/03/30 01:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,10 +57,6 @@
 #include <errno.h>
 #endif
 
-#ifdef __CYGWIN32__
-#include <errno.h>
-#endif
-
 /* ----------------------------------------------------------------
  *				Section 1:	bool, true, false, TRUE, FALSE
  * ----------------------------------------------------------------