From 6e3cc2029d796f8c12be4da06c3fba7dc298098a Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 22 Oct 2004 22:33:58 +0000 Subject: [PATCH] Fix tsearch build problems. Magnus Hagander --- src/include/miscadmin.h | 4 ++-- src/makefiles/Makefile.win32 | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 1bf019b557..ec3ea9334d 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.171 2004/10/18 19:08:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.172 2004/10/22 22:33:58 tgl Exp $ * * NOTES * some of the information in this file should be moved to other files. @@ -136,7 +136,7 @@ extern struct Port *MyProcPort; extern long MyCancelKey; extern char OutputFileName[]; -extern char my_exec_path[]; +extern DLLIMPORT char my_exec_path[]; extern char pkglib_path[]; #ifdef EXEC_BACKEND diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index f4652489b6..5cf543d309 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.3 2003/11/29 19:52:12 pgsql Exp $ +# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.4 2004/10/22 22:33:58 tgl Exp $ # Use replacement include files for those missing on Win32 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32" @@ -23,6 +23,10 @@ override CPPFLAGS+= -DBUILDING_DLL endif endif +ifneq (,$(findstring timezone,$(subdir))) +override CPPFLAGS+= -DBUILDING_DLL +endif + ifneq (,$(findstring ecpg/lib,$(subdir))) override CPPFLAGS+= -DBUILDING_DLL endif -- 2.50.0