Avoid using unnecessary pgwin32_safestat in libpq.

diff --git a/src/include/port.h b/src/include/port.h
index 04450a5a6f8e6c3d7cf4d29dccfa117ca8f0754a..0d7775094efc07f16eee629132d10805124e1ac7 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/port.h,v 1.106.2.5 2008/04/12 00:00:08 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/port.h,v 1.106.2.6 2008/04/16 14:24:38 adunstan Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -280,8 +280,11 @@ extern bool rmtree(char *path, bool rmtopdir);
  *
  * We must pull in sys/stat.h here so the system header definition
  * goes in first, and we redefine that, and not the other way around.
+ *
+ * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
+ * is defined we don't bother with this.
  */
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(UNSAFE_STAT_OK)
 #include <sys/stat.h>
 extern int     pgwin32_safestat(const char *path, struct stat *buf);
 #define stat(a,b) pgwin32_safestat(a,b)

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 538652e6becad2fb0ef9eb22e94075c5a51bb4e3..8d50a5d16309ca0965abf0a0994752722566bed5 100644 (file)
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.149.2.3 2007/11/30 16:21:22 mha Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.149.2.4 2008/04/16 14:24:38 adunstan Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ SO_MAJOR_VERSION= 5
 SO_MINOR_VERSION= 0
 DLTYPE= library
 
-override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
+override CPPFLAGS :=  -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
 ifneq ($(PORTNAME), win32)
 override CFLAGS += $(PTHREAD_CFLAGS)
 endif

diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index 421629db52537d18f48e8d9c757ca855bf02c921..9f4a3c11e872099ddc81555afc7794e55f19d0fe 100644 (file)
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -79,6 +79,7 @@ if ($solution->{options}->{tcl}) {
 
 my $libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');
 $libpq->AddDefine('FRONTEND');
+$libpq->AddDefine('UNSAFE_STAT_OK');
 $libpq->AddIncludeDir('src\port');
 $libpq->AddLibrary('wsock32.lib');
 $libpq->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});