Fix pgindent of libpq-fe.h by hacking pgindent script.

Remove pgbench comment that was causing problems.

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index cac391e231acc06022e89a3548e2e831bd736c3a..70081be5858a99b3bec210038f2d6e2e729fcf94 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.46 2005/11/22 18:17:04 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.47 2005/11/23 04:23:28 momjian Exp $
  *
  * pgbench: a simple benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -1110,8 +1110,7 @@ main(int argc, char **argv)
                                        fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
                                        exit(1);
                                }
-#endif   /* #if !(defined(__CYGWIN__) ||
-                                                                * defined(__MINGW32__)) */
+#endif
                                break;
                        case 'C':
                                is_connect = 1;

diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 7f1d1e9fc3501762e1be680a4042fe833c15ef3b..f0f0cede54eed9bbec7381ac6c67dabc6fb32f33 100644 (file)
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.121 2005/11/22 18:17:33 momjian Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.122 2005/11/23 04:23:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ extern                "C"
 
 /* Application-visible enum types */
 
-                       typedef enum
+typedef enum
 {
        /*
         * Although it is okay to add to this list, values which become unused

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 887189ead68a43613050ba8cd85a5d2560dc1ded..530c6d27035320976815562e2ec5fecbdef3a2f2 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -1993,6 +1993,14 @@ do
                }
                else    print $0;
        }' |
+# fix indenting of typedef caused by __cplusplus in libpq-fe.h
+       (
+               if echo "$FILE" | grep -q 'libpq-fe.h$'
+               then    sed 's/^[       ]*typedef enum/typedef enum/'
+               else    cat
+               fi
+       ) |
+# end
        cat >/tmp/$$ && cat /tmp/$$ >"$FILE"
 done