Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 02566f1

Browse files
committed
On Sat, Aug 25, 2001 at 08:15:45PM -0400, Bruce Momjian wrote:
> Can someone research this and figure out what the proper solution for > this is? Seems we are going around in circles if we keep > adding/removing DLLIMPORT. I believe that the attached patch is the correct solution -- I apologize for the gyrations. With the attached patch, Cygwin libpq++ builds cleanly again. The root cause was that DLLIMPORT was defaulting to __declspec(dllimport) since BUILDING_DLL was *not* defined when building the libpq++ DLL. Unfortunately, to test my patch requires changing the following makefile: src/interfaces/libpq++/examples/Makefile and the #includes in all of the *.cc to build against the source tree instead of the following hardcoded installation directory structure: /usr/local/pgsql I was able to manually build src/interfaces/libpq++/examples/testlibpq0.exe against my Cygwin libpq++ without errors. However, I have not tried to actually test testlibpq0.exe. Is this sufficient? Or, do you want me to clean up libpq++/examples too? (Or, is it silly to even ask? :,)) Let me know how you want to proceed and I will submit a patch to pgsql-patches. Jason Tishler
1 parent 16910e4 commit 02566f1

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/makefiles/Makefile.win

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.14 2001/08/29 19:14:40 petere Exp $
1+
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.15 2001/09/06 02:58:33 momjian Exp $
22
LDFLAGS+= -g
33
DLLTOOL= dlltool
44
DLLWRAP= dllwrap
@@ -28,6 +28,10 @@ ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib)
2828
override CPPFLAGS+= -DBUILDING_DLL=1
2929
endif
3030

31+
ifeq ($(findstring interfaces/libpq++,$(subdir)), interfaces/libpq++)
32+
override CPPFLAGS+= -DBUILDING_DLL=1
33+
endif
34+
3135
ifeq ($(findstring src/pl/plpython,$(subdir)), src/pl/plpython)
3236
override CPPFLAGS+= -DUSE_DL_IMPORT
3337
endif

0 commit comments

Comments
 (0)