Fix some minor portability issues, per Chris K-L.

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index fc497c48624d5745cb550757902e1a36915daa38..3253dab4b6249d4d3fb1128542a1c9dd436b45b0 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.24 2003/06/10 09:07:15 ishii Exp $
+ * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.25 2003/08/01 02:21:17 tgl Exp $
  *
  * pgbench: a simple TPC-B like benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -41,6 +41,10 @@
 #include <sys/resource.h>
 #endif   /* ! WIN32 */
 
+extern char *optarg;
+extern int     optind;
+
+
 /********************************************************************
  * some configurable parameters */
 
@@ -661,10 +665,6 @@ printResults(
 int
 main(int argc, char **argv)
 {
-       extern char *optarg;
-       extern int      optind,
-                               opterr,
-                               optopt;
        int                     c;
        int                     is_init_mode = 0;               /* initialize mode? */
        int                     is_no_vacuum = 0;               /* no vacuum at all before

diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index fb0d931615141c37720aa72fc0bc13762d1e9c87..110de6dff45d1ed9375bed0e62fb47b1122d3a4f 100644 (file)
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.10 2003/06/12 08:02:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.11 2003/08/01 02:21:17 tgl Exp $
  *
  * Copyright (c) 2001,2002     Tatsuo Ishii
  *
@@ -200,14 +200,14 @@ pgstattuple_real(Relation rel)
        for (i = 0; i < NCOLUMNS; i++)
                values[i] = (char *) palloc(NCHARS * sizeof(char));
        i = 0;
-       snprintf(values[i++], NCHARS, "%lld", table_len);
-       snprintf(values[i++], NCHARS, "%lld", tuple_count);
-       snprintf(values[i++], NCHARS, "%lld", tuple_len);
+       snprintf(values[i++], NCHARS, INT64_FORMAT, table_len);
+       snprintf(values[i++], NCHARS, INT64_FORMAT, tuple_count);
+       snprintf(values[i++], NCHARS, INT64_FORMAT, tuple_len);
        snprintf(values[i++], NCHARS, "%.2f", tuple_percent);
-       snprintf(values[i++], NCHARS, "%lld", dead_tuple_count);
-       snprintf(values[i++], NCHARS, "%lld", dead_tuple_len);
+       snprintf(values[i++], NCHARS, INT64_FORMAT, dead_tuple_count);
+       snprintf(values[i++], NCHARS, INT64_FORMAT, dead_tuple_len);
        snprintf(values[i++], NCHARS, "%.2f", dead_tuple_percent);
-       snprintf(values[i++], NCHARS, "%lld", free_space);
+       snprintf(values[i++], NCHARS, INT64_FORMAT, free_space);
        snprintf(values[i++], NCHARS, "%.2f", free_percent);
 
        /* build a tuple */