diff options
| -rw-r--r-- | src/backend/utils/Gen_fmgrtab.sh.in | 10 | ||||
| -rw-r--r-- | src/backend/utils/adt/geo_ops.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/mac.c | 14 | ||||
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 4 | ||||
| -rw-r--r-- | src/bin/psql/psql.c | 10 |
6 files changed, 25 insertions, 23 deletions
diff --git a/src/backend/utils/Gen_fmgrtab.sh.in b/src/backend/utils/Gen_fmgrtab.sh.in index 757f291e664..1ccf22de570 100644 --- a/src/backend/utils/Gen_fmgrtab.sh.in +++ b/src/backend/utils/Gen_fmgrtab.sh.in @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.10 1998/10/14 16:06:14 thomas Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $ # # NOTES # Passes any -D options on to cpp prior to generating the list @@ -79,7 +79,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf * * Copyright (c) 1994, Regents of the University of California * - * $Id: Gen_fmgrtab.sh.in,v 1.10 1998/10/14 16:06:14 thomas Exp $ + * $Id: Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $ * * NOTES * ****************************** @@ -193,7 +193,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.10 1998/10/14 16:06:14 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $ * * NOTES * @@ -220,7 +220,9 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF #else # ifdef HAVE_LIMITS_H # include <limits.h> -# define MAXINT INT_MAX +# ifndef MAXINT +# define MAXINT INT_MAX +# endif # else # include <values.h> # endif diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 1a99c366160..53d48c45c05 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.37 1998/09/01 04:32:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.38 1998/10/26 01:01:33 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -872,7 +872,7 @@ line_out(LINE *line) /* line_construct_pm() * point-slope */ -LINE * +static LINE * line_construct_pm(Point *pt, double m) { LINE *result = palloc(sizeof(LINE)); @@ -1294,7 +1294,7 @@ path_open(PATH *path) } /* path_open() */ -PATH * +static PATH * path_copy(PATH *path) { PATH *result; diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index e356b68f1df..c4a43f39dcf 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Id: mac.c,v 1.5 1998/10/08 02:08:45 momjian Exp $ + * $Id: mac.c,v 1.6 1998/10/26 01:01:36 tgl Exp $ */ #include <stdio.h> @@ -234,40 +234,40 @@ macaddr_lt(macaddr *a1, macaddr *a2) { return ((hibits(a1) < hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) < lobits(a2))); -}; +} bool macaddr_le(macaddr *a1, macaddr *a2) { return ((hibits(a1) < hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) <= lobits(a2))); -}; +} bool macaddr_eq(macaddr *a1, macaddr *a2) { return ((hibits(a1) == hibits(a2)) && (lobits(a1) == lobits(a2))); -}; +} bool macaddr_ge(macaddr *a1, macaddr *a2) { return ((hibits(a1) > hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) >= lobits(a2))); -}; +} bool macaddr_gt(macaddr *a1, macaddr *a2) { return ((hibits(a1) > hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) > lobits(a2))); -}; +} bool macaddr_ne(macaddr *a1, macaddr *a2) { return ((hibits(a1) != hibits(a2)) || (lobits(a1) != lobits(a2))); -}; +} /* * Comparison function for sorting: diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 8bde27bcd0b..7e7b27b82cb 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * out of it's tuple * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.5 1998/10/06 22:14:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.6 1998/10/26 01:01:35 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -1556,7 +1556,7 @@ get_tle_expr(QryHier *qh, int rt_index, TargetEntry *tle, bool varprefix) * with the type cast out of a Const * ---------- */ -char * +static char * get_const_expr(Const *constval) { HeapTuple typetup; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 59a823dbd05..6a2531010b8 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.92 1998/10/12 02:05:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.93 1998/10/26 01:05:07 tgl Exp $ * * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * @@ -2527,7 +2527,7 @@ ParseACL(const char *acls, int *count) * Called for sequences and tables */ -void +static void dumpACL(FILE *fout, TableInfo tbinfo) { int k, diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index 485ef54ecf5..a5d6cfa0061 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.162 1998/10/08 00:10:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.163 1998/10/26 01:04:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -379,7 +379,7 @@ listAllDbs(PsqlSettings *pset) * List The Database Tables returns 0 if all went well * */ -int +static int tableList(PsqlSettings *pset, bool deep_tablelist, char info_type, bool system_tables) { @@ -535,7 +535,7 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type, * List Tables Grant/Revoke Permissions returns 0 if all went well * */ -int +static int rightsList(PsqlSettings *pset) { char listbuf[512]; @@ -661,7 +661,7 @@ static void emitNtimes (FILE *fout, const char *str, int N) * * */ -int +static int tableDesc(PsqlSettings *pset, char *table, FILE *fout) { char descbuf[512]; @@ -877,7 +877,7 @@ tableDesc(PsqlSettings *pset, char *table, FILE *fout) * * */ -int +static int objectDescription(PsqlSettings *pset, char *object) { char descbuf[512]; |