Remove NT-specific file open defines by defining our own open macros for

"rb" and "wb".

4 files changed, 9 insertions, 29 deletions

diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 6e6d32e08da..2736f92555c 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.54 2000/05/30 04:24:50 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.55 2000/06/02 15:57:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -549,11 +549,7 @@ _ReadLOArray(char *str,
 	{
 		FILE	   *afd;
 
-#ifndef __CYGWIN32__
-		if ((afd = AllocateFile(accessfile, "r")) == NULL)
-#else
-		if ((afd = AllocateFile(accessfile, "r")) == NULL)
-#endif
+		if ((afd = AllocateFile(accessfile, PG_BINARY_R)) == NULL)
 			elog(ERROR, "unable to open access pattern file");
 		*chunkFlag = true;
 		retStr = _ChunkArray(*fd, afd, ndim, dim, baseSize, nbytes,
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 02a6f0e24c3..fe397ca8508 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.98 2000/05/30 00:49:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.99 2000/06/02 15:57:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2122,11 +2122,7 @@ init_irels(void)
 	int			i;
 	int			relno;
 
-#ifndef __CYGWIN32__
-	if ((fd = FileNameOpenFile(RELCACHE_INIT_FILENAME, O_RDONLY, 0600)) < 0)
-#else
-	if ((fd = FileNameOpenFile(RELCACHE_INIT_FILENAME, O_RDONLY | O_BINARY, 0600)) < 0)
-#endif
+	if ((fd = FileNameOpenFile(RELCACHE_INIT_FILENAME, O_RDONLY | PG_BINARY, 0600)) < 0)
 	{
 		write_irels();
 		return;
@@ -2292,11 +2288,7 @@ write_irels(void)
 	snprintf(finalfilename, sizeof(finalfilename), "%s%c%s",
 			 DatabasePath, SEP_CHAR, RELCACHE_INIT_FILENAME);
 
-#ifndef __CYGWIN32__
-	fd = PathNameOpenFile(tempfilename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-#else
-	fd = PathNameOpenFile(tempfilename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600);
-#endif
+	fd = PathNameOpenFile(tempfilename, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY, 0600);
 	if (fd < 0)
 		elog(FATAL, "cannot create init file %s", tempfilename);
 
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index c92b79ff07e..3f3d4b166d5 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.46 2000/05/02 08:13:08 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.47 2000/06/02 15:57:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -207,11 +207,7 @@ SetCharSet()
 		map_file = (char *) malloc((strlen(DataDir) +
 									strlen(p) + 2) * sizeof(char));
 		sprintf(map_file, "%s/%s", DataDir, p);
-#ifndef __CYGWIN32__
-		file = AllocateFile(map_file, "r");
-#else
-		file = AllocateFile(map_file, "rb");
-#endif
+		file = AllocateFile(map_file, PG_BINARY_R);
 		if (file == NULL)
 			return;
 		eof = false;
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 64347f00fee..a66c6a719e4 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.37 2000/04/12 17:16:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.38 2000/06/02 15:57:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -146,11 +146,7 @@ GetRawDatabaseInfo(const char *name, Oid *db_id, char *path)
 	dbfname = (char *) palloc(strlen(DataDir) + strlen(DatabaseRelationName) + 2);
 	sprintf(dbfname, "%s%c%s", DataDir, SEP_CHAR, DatabaseRelationName);
 
-#ifndef __CYGWIN32__
-	if ((dbfd = open(dbfname, O_RDONLY, 0)) < 0)
-#else
-	if ((dbfd = open(dbfname, O_RDONLY | O_BINARY, 0)) < 0)
-#endif
+	if ((dbfd = open(dbfname, O_RDONLY | PG_BINARY, 0)) < 0)
 		elog(FATAL, "cannot open %s: %s", dbfname, strerror(errno));
 
 	pfree(dbfname);