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

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index 8e48d254053f91bad1b12f0004038cbaf5a7037b..7f1c6a1ed722d33f3380df675da2845aa419dd62 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -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 76a54379aca50069c9c6952fd81fc1be0695a7ba..af2fd2e9f14225bdb54c6b3b36beb73fa21a58b7 100644 (file)
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -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 */