Commit 78b08584 authored by Tom Lane's avatar Tom Lane

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

Includes fixes from Joe Conway.
parent f85f43df
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $ # $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.9 2003/05/14 03:27:21 tgl Exp $
subdir = contrib/cube subdir = contrib/cube
top_builddir = ../.. top_builddir = ../..
...@@ -17,17 +17,11 @@ cubeparse.o: cubescan.c ...@@ -17,17 +17,11 @@ cubeparse.o: cubescan.c
cubeparse.c: cubeparse.h ; cubeparse.c: cubeparse.h ;
# The sed hack is so that we can get the same error messages with
# bison 1.875 and later as we did with earlier bisons. Eventually,
# I suppose, we should re-standardize on "syntax error" --- in which
# case flip the sed translation, but don't remove it.
cubeparse.h: cubeparse.y cubeparse.h: cubeparse.y
ifdef YACC ifdef YACC
$(YACC) -d $(YFLAGS) -p cube_yy $< $(YACC) -d $(YFLAGS) -p cube_yy $<
sed -e 's/"syntax error/"parse error/' < y.tab.c > cubeparse.c mv -f y.tab.c cubeparse.c
mv -f y.tab.h cubeparse.h mv -f y.tab.h cubeparse.h
rm -f y.tab.c
else else
@$(missing) bison $< $@ @$(missing) bison $< $@
endif endif
......
...@@ -2,16 +2,12 @@ ...@@ -2,16 +2,12 @@
* Header file for pg_autovacuum.c * Header file for pg_autovacuum.c
* (c) 2003 Matthew T. O'Connor * (c) 2003 Matthew T. O'Connor
*/ */
#include "postgres_fe.h"
#include <stdio.h>
#include <stdlib.h>
/* Includes that I added */
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h>
#include <sys/time.h> #include <sys/time.h>
#include "../../interfaces/libpq/libpq-fe.h"
#include "libpq-fe.h"
#include "lib/dllist.h" #include "lib/dllist.h"
#define AUTOVACUUM_DEBUG 1 #define AUTOVACUUM_DEBUG 1
......
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
/* for ntohl/htonl */ /* for ntohl/htonl */
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h>
#define _PASSWORD_EFMT1 '_' #define _PASSWORD_EFMT1 '_'
......
# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $ # $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.9 2003/05/14 03:27:22 tgl Exp $
subdir = contrib/seg subdir = contrib/seg
top_builddir = ../.. top_builddir = ../..
...@@ -16,17 +16,11 @@ segparse.o: segscan.c ...@@ -16,17 +16,11 @@ segparse.o: segscan.c
segparse.c: segparse.h ; segparse.c: segparse.h ;
# The sed hack is so that we can get the same error messages with
# bison 1.875 and later as we did with earlier bisons. Eventually,
# I suppose, we should re-standardize on "syntax error" --- in which
# case flip the sed translation, but don't remove it.
segparse.h: segparse.y segparse.h: segparse.y
ifdef YACC ifdef YACC
$(YACC) -d $(YFLAGS) -p seg_yy $< $(YACC) -d $(YFLAGS) -p seg_yy $<
sed -e 's/"syntax error/"parse error/' < y.tab.c > segparse.c mv -f y.tab.c segparse.c
mv -f y.tab.h segparse.h mv -f y.tab.h segparse.h
rm -f y.tab.c
else else
@$(missing) bison $< $@ @$(missing) bison $< $@
endif endif
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "fmgr.h" #include "fmgr.h"
#include "funcapi.h" #include "funcapi.h"
#include "executor/spi.h" #include "executor/spi.h"
#include "lib/stringinfo.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/guc.h" #include "utils/guc.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment