From: Andrew Dunstan Date: Wed, 16 Apr 2008 14:21:23 +0000 (+0000) Subject: Avoid using unnecessary pgwin32_safestat in libpq. X-Git-Tag: REL8_3_2~48 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=547f61f028d3719998b0cae7e8194daec3ad81ff;p=postgresql Avoid using unnecessary pgwin32_safestat in libpq. --- diff --git a/src/include/port.h b/src/include/port.h index c818f538a3..f6ccfaecba 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.116.2.3 2008/04/11 23:59:49 tgl Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.116.2.4 2008/04/16 14:21:22 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -286,8 +286,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 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 002ec246cc..67e868bed1 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.159.2.1 2008/03/05 05:39:17 tgl Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.159.2.2 2008/04/16 14:21:22 adunstan Exp $ # #------------------------------------------------------------------------- @@ -20,7 +20,7 @@ SO_MAJOR_VERSION= 5 SO_MINOR_VERSION= 1 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.pm b/src/tools/msvc/Mkvcbuild.pm index 3d564f83b8..151b591986 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -3,7 +3,7 @@ package Mkvcbuild; # # Package that generates build files for msvc build # -# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25.2.1 2008/02/28 12:18:03 mha Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25.2.2 2008/04/16 14:21:23 adunstan Exp $ # use Carp; use Win32; @@ -127,6 +127,7 @@ sub mkvcbuild $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('secur32.lib');