aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2005-07-05 17:24:30 +0000
committerBruce Momjian <bruce@momjian.us>2005-07-05 17:24:30 +0000
commit7e33fae3c1c9fb3aedf9dff6acc6161305a77163 (patch)
treefb1f83000c668fa4b907e46889f4e9580177b95e
parent4f979e8bacbfd29db2a1ed8bd75f7527858e48c4 (diff)
downloadpostgresql-7e33fae3c1c9fb3aedf9dff6acc6161305a77163.tar.gz
postgresql-7e33fae3c1c9fb3aedf9dff6acc6161305a77163.zip
Add NO_PGPORT defines to fix win32/cygwin builds for new target platform
build of zic.
-rw-r--r--src/include/port.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/port.h b/src/include/port.h
index e352ef2d0b1..940e060720c 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/port.h,v 1.77 2005/07/04 19:54:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/port.h,v 1.78 2005/07/05 17:24:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -178,7 +178,7 @@ extern int pclose_check(FILE *stream);
#define TZNAME_GLOBAL _tzname
#endif
-#if defined(WIN32) || defined(__CYGWIN__)
+#if (defined(WIN32) || defined(__CYGWIN__)) && !defined(NO_PGPORT)
/*
* Win32 doesn't have reliable rename/unlink during concurrent access,
* and we need special code to do symlinks.
@@ -204,11 +204,11 @@ extern int pgsymlink(const char *oldpath, const char *newpath);
#define symlink(oldpath, newpath) pgsymlink(oldpath, newpath)
#endif
-#endif /* defined(WIN32) || defined(__CYGWIN__) */
+#endif /* defined(WIN32) || defined(__CYGWIN__) && !defined(NO_PGPORT) */
extern bool rmtree(char *path, bool rmtopdir);
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(NO_PGPORT)
/* open() replacement to allow delete of held files and passing
* of special options. */