git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/include/port.h b/src/include/port.h

index 3215b5f0a242e6cfdbc5629f9529eeb038975ff8..ae482bd8559c56ab55530ba2aed9c163c4ac2078 100644 (file)

--- a/src/include/port.h

+++ b/src/include/port.h

* 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.120 2008年04月11日 23:53:00 tgl Exp $

+ * $PostgreSQL: pgsql/src/include/port.h,v 1.121 2008年04月16日 14:19:56 adunstan Exp $

*

*-------------------------------------------------------------------------

*/

*

* 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 fced907efacb69dc7676e553f60c6217ee23ce7d..62885fbb5e01ed6ede699355720c32b001208949 100644 (file)

--- a/src/interfaces/libpq/Makefile

+++ b/src/interfaces/libpq/Makefile

# 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.165 2008年04月07日 14:15:58 petere Exp $

+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.166 2008年04月16日 14:19:56 adunstan Exp $

#

#-------------------------------------------------------------------------

SO_MAJOR_VERSION= 5

SO_MINOR_VERSION= 2

-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 8081af3d92cb8b629047fc210ef1ec47f7b73b0f..fb8ccec59eaa7c5f33f0c69317ea99b78510fa05 100644 (file)

--- a/src/tools/msvc/Mkvcbuild.pm

+++ b/src/tools/msvc/Mkvcbuild.pm

#

# Package that generates build files for msvc build

#

-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.26 2008年02月28日 12:17:59 mha Exp $

+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.27 2008年04月16日 14:19:56 adunstan Exp $

#

use Carp;

use Win32;

$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');