Commit78b0858

committed

Fix various recent build and regression-test problems in contrib/.

Includes fixes from Joe Conway.

1 parentf85f43d commit78b0858Copy full SHA for 78b0858

File tree

-23

lines changed

-23

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.9 2003/05/14 03:27:21 tgl Exp $`
`2`	`2`
`3`	`3`	`subdir = contrib/cube`
`4`	`4`	`top_builddir = ../..`
`@@ -17,17 +17,11 @@ cubeparse.o: cubescan.c`
`17`	`17`
`18`	`18`	`cubeparse.c: cubeparse.h ;`
`19`	`19`
`20`		`-# The sed hack is so that we can get the same error messages with`
`21`		`-# bison 1.875 and later as we did with earlier bisons. Eventually,`
`22`		`-# I suppose, we should re-standardize on "syntax error" --- in which`
`23`		`-# case flip the sed translation, but don't remove it.`
`24`		`-`
`25`	`20`	`cubeparse.h: cubeparse.y`
`26`	`21`	`ifdefYACC`
`27`	`22`	`$(YACC) -d $(YFLAGS) -p cube_yy $<`
`28`		`-sed -e 's/"syntax error/"parse error/' <y.tab.c > cubeparse.c`
	`23`	`+mv -fy.tab.c cubeparse.c`
`29`	`24`	`mv -f y.tab.h cubeparse.h`
`30`		`-rm -f y.tab.c`
`31`	`25`	`else`
`32`	`26`	`@$(missing) bison $< $@`
`33`	`27`	`endif`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,12 @@`
`2`	`2`	`* Header file for pg_autovacuum.c`
`3`	`3`	`* (c) 2003 Matthew T. O'Connor`
`4`	`4`	`*/`
	`5`	`+#include"postgres_fe.h"`
`5`	`6`
`6`		`-#include<stdio.h>`
`7`		`-#include<stdlib.h>`
`8`		`-`
`9`		`-/* Includes that I added */`
`10`		`-#include<string.h>`
`11`	`7`	`#include<unistd.h>`
`12`		`-#include<getopt.h>`
`13`	`8`	`#include<sys/time.h>`
`14`		`-#include"../../interfaces/libpq/libpq-fe.h"`
	`9`	`+`
	`10`	`+#include"libpq-fe.h"`
`15`	`11`	`#include"lib/dllist.h"`
`16`	`12`
`17`	`13`	`#defineAUTOVACUUM_DEBUG 1`

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.9 2003/05/14 03:27:22 tgl Exp $`
`2`	`2`
`3`	`3`	`subdir = contrib/seg`
`4`	`4`	`top_builddir = ../..`
`@@ -16,17 +16,11 @@ segparse.o: segscan.c`
`16`	`16`
`17`	`17`	`segparse.c: segparse.h ;`
`18`	`18`
`19`		`-# The sed hack is so that we can get the same error messages with`
`20`		`-# bison 1.875 and later as we did with earlier bisons. Eventually,`
`21`		`-# I suppose, we should re-standardize on "syntax error" --- in which`
`22`		`-# case flip the sed translation, but don't remove it.`
`23`		`-`
`24`	`19`	`segparse.h: segparse.y`
`25`	`20`	`ifdefYACC`
`26`	`21`	`$(YACC) -d $(YFLAGS) -p seg_yy $<`
`27`		`-sed -e 's/"syntax error/"parse error/' <y.tab.c > segparse.c`
	`22`	`+mv -fy.tab.c segparse.c`
`28`	`23`	`mv -f y.tab.h segparse.h`
`29`		`-rm -f y.tab.c`
`30`	`24`	`else`
`31`	`25`	`@$(missing) bison $< $@`
`32`	`26`	`endif`

Lines changed: 1 addition & 0 deletions

Comments

(0)