Commitf13cb7e

committed

Fixes to make ecpg work on Cygwin, from Jason Tishler <Jason.Tishler@dothill.com>.

1 parentb95ff0c commitf13cb7eCopy full SHA for f13cb7e

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,14 @@`
`1`	`1`	`#ifndefPOSTGRES_SQLCA_H`
`2`	`2`	`#definePOSTGRES_SQLCA_H`
`3`	`3`
	`4`	`+#ifndefDLLIMPORT`
	`5`	`+#ifdef__CYGWIN__`
	`6`	`+#defineDLLIMPORT __declspec (dllimport)`
	`7`	`+#else`
	`8`	`+#defineDLLIMPORT`
	`9`	`+#endif/* __CYGWIN__ */`
	`10`	`+#endif/* DLLIMPORT */`
	`11`	`+`
`4`	`12`	`#defineSQLERRMC_LEN70`
`5`	`13`
`6`	`14`	`#ifdef__cplusplus`
`@@ -45,7 +53,7 @@ extern"C"`
`45`	`53`	`charsqlext[8];`
`46`	`54`	`};`
`47`	`55`
`48`		`-externstructsqlcasqlca;`
	`56`	`+externDLLIMPORTstructsqlcasqlca;`
`49`	`57`
`50`	`58`
`51`	`59`	`#ifdef__cplusplus`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`all: test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init`
`2`	`2`
`3`	`3`	`#LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq`
`4`		`-LDFLAGS=-g -I ../include -I /usr/include/postgresql -L /usr/lib -lecpg -lpq`
	`4`	`+LDFLAGS=-g -I ../include`
	`5`	`+LDLIBS=-L ../lib -lecpg -L ../../libpq -lpq`
`5`	`6`
`6`	`7`	`#ECPG=/usr/local/pgsql/bin/ecpg -I../include`
`7`	`8`	`ECPG=../preproc/ecpg -I../include`
`@@ -24,4 +25,4 @@ test_text: test_text.c`
`24`	`25`	`$(ECPG)$?`
`25`	`26`
`26`	`27`	`clean:`
`27`		`-rm -f test1 test2 test3 test4 perftest*.c log dyntest dyntest2 test_notice test_code100 test_init test_text`
	`28`	`+rm -f test1 test2 test3 test4 perftest.c log dyntest dyntest2 test_notice test_code100 test_init test_text.exe`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.10 2001/04/04 21:15:56 tgl Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.11 2001/05/03 16:07:52 tgl Exp $`
`2`	`2`	`LDFLAGS+= -g`
`3`	`3`	`DLLTOOL= dlltool`
`4`	`4`	`DLLWRAP= dllwrap`
`@@ -23,3 +23,7 @@ CFLAGS_SL =`
`23`	`23`	`ifeq ($(findstring backend,$(subdir)), backend)`
`24`	`24`	`override CPPFLAGS+= -DBUILDING_DLL=1`
`25`	`25`	`endif`
	`26`	`+`
	`27`	`+ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib)`
	`28`	`+override CPPFLAGS+= -DBUILDING_DLL=1`
	`29`	`+endif`

Comments

(0)