Fixes to make ecpg work on Cygwin, from Jason Tishler <[email protected]>.

diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h
index 319a5bc59f116e29ff6cb9237a609d8e0c17848a..3f7e307da760abd566b8b03d6bff958b5ad169a3 100644 (file)
--- a/src/interfaces/ecpg/include/sqlca.h
+++ b/src/interfaces/ecpg/include/sqlca.h
@@ -1,6 +1,14 @@
 #ifndef POSTGRES_SQLCA_H
 #define POSTGRES_SQLCA_H
 
+#ifndef DLLIMPORT
+#ifdef __CYGWIN__
+#define DLLIMPORT __declspec (dllimport)
+#else
+#define DLLIMPORT
+#endif /* __CYGWIN__ */
+#endif /* DLLIMPORT */
+
 #define SQLERRMC_LEN   70
 
 #ifdef __cplusplus
@@ -45,7 +53,7 @@ extern                "C"
                char            sqlext[8];
        };
 
-       extern struct sqlca sqlca;
+       extern DLLIMPORT struct sqlca sqlca;
 
 
 #ifdef __cplusplus

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index 3ac9b8d41baebfcd7beda27880624eb987bca504..65a2c5b3a708105c0672cf29460f53b93ec5bf11 100644 (file)
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -1,7 +1,8 @@
 all: test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init
 
 #LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq
-LDFLAGS=-g -I ../include -I /usr/include/postgresql -L /usr/lib -lecpg -lpq
+LDFLAGS=-g -I ../include
+LDLIBS=-L ../lib -lecpg -L ../../libpq -lpq
 
 #ECPG=/usr/local/pgsql/bin/ecpg -I../include
 ECPG=../preproc/ecpg -I../include
@@ -24,4 +25,4 @@ test_text: test_text.c
        $(ECPG) $? 
 
 clean:
-       rm -f test1 test2 test3 test4 perftest *.c log dyntest dyntest2 test_notice test_code100 test_init test_text
+       rm -f test1 test2 test3 test4 perftest *.c log dyntest dyntest2 test_notice test_code100 test_init test_text *.exe

diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win
index 9ca5d55f9224a3519d87b926fc84fc37656cad48..5d372f3149a4ef973ac64cf975f867e145b49122 100644 (file)
--- a/src/makefiles/Makefile.win
+++ b/src/makefiles/Makefile.win
@@ -23,3 +23,7 @@ CFLAGS_SL =
 ifeq ($(findstring backend,$(subdir)), backend)
 override CPPFLAGS+= -DBUILDING_DLL=1
 endif
+
+ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib)
+override CPPFLAGS+= -DBUILDING_DLL=1
+endif