diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-11-23 04:23:30 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-11-23 04:23:30 +0000 |
| commit | aac96b899490c4d23204660b3b6d47e3dd4d918c (patch) | |
| tree | e6cfaddb86dcdd5f83c80d3234012a59f7b7f1b6 | |
| parent | ce1d8293f0bd218ec33e5876621d30509496701f (diff) | |
| download | postgresql-aac96b899490c4d23204660b3b6d47e3dd4d918c.tar.gz postgresql-aac96b899490c4d23204660b3b6d47e3dd4d918c.zip | |
Fix pgindent of libpq-fe.h by hacking pgindent script.
Remove pgbench comment that was causing problems.
| -rw-r--r-- | contrib/pgbench/pgbench.c | 5 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-fe.h | 4 | ||||
| -rwxr-xr-x | src/tools/pgindent/pgindent | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index cac391e231a..70081be5858 100644 --- 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 7f1d1e9fc35..f0f0cede54e 100644 --- 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 887189ead68..530c6d27035 100755 --- 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 |