diff options
author | Tom Lane | 2003-05-14 03:27:22 +0000 |
---|---|---|
committer | Tom Lane | 2003-05-14 03:27:22 +0000 |
commit | b58671435e11756fdfcec41c1fa7b669bea61b85 (patch) | |
tree | 97324c64ca26d495ab72945f8fa371438dac20ec | |
parent | d68047937dd873539ae10f411dd3365c2bf1c972 (diff) |
Fix various recent build and regression-test problems in contrib/.
Includes fixes from Joe Conway.
-rw-r--r-- | contrib/cube/Makefile | 8 | ||||
-rw-r--r-- | contrib/pg_autovacuum/pg_autovacuum.h | 10 | ||||
-rw-r--r-- | contrib/pgcrypto/crypt-des.c | 1 | ||||
-rw-r--r-- | contrib/seg/Makefile | 8 | ||||
-rw-r--r-- | contrib/tablefunc/tablefunc.c | 1 |
5 files changed, 7 insertions, 21 deletions
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile index 626b1d83d7..6645bc3cd3 100644 --- a/contrib/cube/Makefile +++ b/contrib/cube/Makefile @@ -17,17 +17,11 @@ cubeparse.o: cubescan.c 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 ifdef YACC $(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 - rm -f y.tab.c else @$(missing) bison $< $@ endif diff --git a/contrib/pg_autovacuum/pg_autovacuum.h b/contrib/pg_autovacuum/pg_autovacuum.h index 9b9f4d5d27..18a85bc3d4 100644 --- a/contrib/pg_autovacuum/pg_autovacuum.h +++ b/contrib/pg_autovacuum/pg_autovacuum.h @@ -2,16 +2,12 @@ * Header file for pg_autovacuum.c * (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 <getopt.h> #include <sys/time.h> -#include "../../interfaces/libpq/libpq-fe.h" + +#include "libpq-fe.h" #include "lib/dllist.h" #define AUTOVACUUM_DEBUG 1 diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c index 7611e30f7c..38bce1742f 100644 --- a/contrib/pgcrypto/crypt-des.c +++ b/contrib/pgcrypto/crypt-des.c @@ -65,6 +65,7 @@ /* for ntohl/htonl */ #include <netinet/in.h> +#include <arpa/inet.h> #define _PASSWORD_EFMT1 '_' diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile index b54aa683c2..355bdbcb62 100644 --- a/contrib/seg/Makefile +++ b/contrib/seg/Makefile @@ -16,17 +16,11 @@ segparse.o: segscan.c 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 ifdef YACC $(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 - rm -f y.tab.c else @$(missing) bison $< $@ endif diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c index 81f68119f8..70df31d557 100644 --- a/contrib/tablefunc/tablefunc.c +++ b/contrib/tablefunc/tablefunc.c @@ -32,6 +32,7 @@ #include "fmgr.h" #include "funcapi.h" #include "executor/spi.h" +#include "lib/stringinfo.h" #include "miscadmin.h" #include "utils/builtins.h" #include "utils/guc.h" |