Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 78b0858

Browse files
committed
Fix various recent build and regression-test problems in contrib/.
Includes fixes from Joe Conway.
1 parent f85f43d commit 78b0858

File tree

5 files changed

+9
-23
lines changed

5 files changed

+9
-23
lines changed

contrib/cube/Makefile

+2-8
Original file line numberDiff line numberDiff 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 $
22

33
subdir = contrib/cube
44
top_builddir = ../..
@@ -17,17 +17,11 @@ cubeparse.o: cubescan.c
1717

1818
cubeparse.c: cubeparse.h ;
1919

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-
2520
cubeparse.h: cubeparse.y
2621
ifdef YACC
2722
$(YACC) -d $(YFLAGS) -p cube_yy $<
28-
sed -e 's/"syntax error/"parse error/' < y.tab.c > cubeparse.c
23+
mv -f y.tab.c cubeparse.c
2924
mv -f y.tab.h cubeparse.h
30-
rm -f y.tab.c
3125
else
3226
@$(missing) bison $< $@
3327
endif

contrib/pg_autovacuum/pg_autovacuum.h

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
* Header file for pg_autovacuum.c
33
* (c) 2003 Matthew T. O'Connor
44
*/
5+
#include "postgres_fe.h"
56

6-
#include <stdio.h>
7-
#include <stdlib.h>
8-
9-
/* Includes that I added */
10-
#include <string.h>
117
#include <unistd.h>
12-
#include <getopt.h>
138
#include <sys/time.h>
14-
#include "../../interfaces/libpq/libpq-fe.h"
9+
10+
#include "libpq-fe.h"
1511
#include "lib/dllist.h"
1612

1713
#define AUTOVACUUM_DEBUG 1

contrib/pgcrypto/crypt-des.c

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
/* for ntohl/htonl */
6767
#include <netinet/in.h>
68+
#include <arpa/inet.h>
6869

6970
#define _PASSWORD_EFMT1 '_'
7071

contrib/seg/Makefile

+2-8
Original file line numberDiff line numberDiff 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 $
22

33
subdir = contrib/seg
44
top_builddir = ../..
@@ -16,17 +16,11 @@ segparse.o: segscan.c
1616

1717
segparse.c: segparse.h ;
1818

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-
2419
segparse.h: segparse.y
2520
ifdef YACC
2621
$(YACC) -d $(YFLAGS) -p seg_yy $<
27-
sed -e 's/"syntax error/"parse error/' < y.tab.c > segparse.c
22+
mv -f y.tab.c segparse.c
2823
mv -f y.tab.h segparse.h
29-
rm -f y.tab.c
3024
else
3125
@$(missing) bison $< $@
3226
endif

contrib/tablefunc/tablefunc.c

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "fmgr.h"
3333
#include "funcapi.h"
3434
#include "executor/spi.h"
35+
#include "lib/stringinfo.h"
3536
#include "miscadmin.h"
3637
#include "utils/builtins.h"
3738
#include "utils/guc.h"

0 commit comments

Comments
 (0)