Commit31cf893

committed

enable examples to compile on Windows. patch from Hiroshi Saito.

1 parent3c505ef commit31cf893Copy full SHA for 31cf893

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@ subdir = src/test/examples`
`6`	`6`	`top_builddir = ../../..`
`7`	`7`	`include$(top_builddir)/src/Makefile.global`
`8`	`8`
	`9`	`+ifeq ($(PORTNAME), win32)`
	`10`	`+LDLIBS += -lws2_32`
	`11`	`+endif`
	`12`	`+`
`9`	`13`	`overrideCPPFLAGS := -I$(libpq_srcdir)$(CPPFLAGS)`
`10`	`14`	`overrideLDLIBS :=$(libpq_pgport)$(LDLIBS)`
`11`	`15`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/src/test/examples/testlibpq2.c,v 1.15 2009/06/11 14:49:15 momjian Exp $`
	`2`	`+ * $PostgreSQL: pgsql/src/test/examples/testlibpq2.c,v 1.16 2009/12/31 00:16:47 adunstan Exp $`
`3`	`3`	`*`
`4`	`4`	`*`
`5`	`5`	`* testlibpq2.c`
`@@ -24,11 +24,16 @@`
`24`	`24`	`*`
`25`	`25`	`* INSERT INTO TBL1 VALUES (10);`
`26`	`26`	`*/`
	`27`	`+`
	`28`	`+#ifdefWIN32`
	`29`	`+#include<windows.h>`
	`30`	`+#endif`
`27`	`31`	`#include<stdio.h>`
`28`	`32`	`#include<stdlib.h>`
`29`	`33`	`#include<string.h>`
`30`	`34`	`#include<errno.h>`
`31`	`35`	`#include<sys/time.h>`
	`36`	`+#include<sys/types.h>`
`32`	`37`	`#include"libpq-fe.h"`
`33`	`38`
`34`	`39`	`staticvoid`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/src/test/examples/testlibpq3.c,v 1.16 2009/06/11 14:49:15 momjian Exp $`
	`2`	`+ * $PostgreSQL: pgsql/src/test/examples/testlibpq3.c,v 1.17 2009/12/31 00:16:47 adunstan Exp $`
`3`	`3`	`*`
`4`	`4`	`*`
`5`	`5`	`* testlibpq3.c`
`@@ -25,8 +25,14 @@`
`25`	`25`	`*t = (8 bytes) 'ho there'`
`26`	`26`	`*b = (5 bytes) \004\003\002\001\000`
`27`	`27`	`*/`
	`28`	`+`
	`29`	`+#ifdefWIN32`
	`30`	`+#include<windows.h>`
	`31`	`+#endif`
	`32`	`+`
`28`	`33`	`#include<stdio.h>`
`29`	`34`	`#include<stdlib.h>`
	`35`	`+#include<stdint.h>`
`30`	`36`	`#include<string.h>`
`31`	`37`	`#include<sys/types.h>`
`32`	`38`	`#include"libpq-fe.h"`

Comments

(0)