Phase 2 of pgindent updates.

Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.

Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code.  The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there.  BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs.  So the
net result is that in about half the cases, such comments are placed
one tab stop left of before.  This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.

Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.

This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.

Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

src/include/storage/predicate_internals.h

@@ -78,10 +78,10 @@ typedef struct SERIALIZABLEXACT
 	/* these values are not both interesting at the same time */
 	union
 	{
-		SerCommitSeqNo earliestOutConflictCommit;		/* when committed with
-														 * conflict out */
-		SerCommitSeqNo lastCommitBeforeSnapshot;		/* when not committed or
-														 * no conflict out */
+		SerCommitSeqNo earliestOutConflictCommit;	/* when committed with
+													 * conflict out */
+		SerCommitSeqNo lastCommitBeforeSnapshot;	/* when not committed or
+													 * no conflict out */
 	}			SeqNo;
 	SHM_QUEUE	outConflicts;	/* list of write transactions whose data we
 								 * couldn't read. */
@@ -99,18 +99,18 @@ typedef struct SERIALIZABLEXACT
 
 	TransactionId topXid;		/* top level xid for the transaction, if one
 								 * exists; else invalid */
-	TransactionId finishedBefore;		/* invalid means still running; else
-										 * the struct expires when no
-										 * serializable xids are before this. */
+	TransactionId finishedBefore;	/* invalid means still running; else the
+									 * struct expires when no serializable
+									 * xids are before this. */
 	TransactionId xmin;			/* the transaction's snapshot xmin */
 	uint32		flags;			/* OR'd combination of values defined below */
 	int			pid;			/* pid of associated process */
 } SERIALIZABLEXACT;
 
-#define SXACT_FLAG_COMMITTED			0x00000001		/* already committed */
-#define SXACT_FLAG_PREPARED				0x00000002		/* about to commit */
-#define SXACT_FLAG_ROLLED_BACK			0x00000004		/* already rolled back */
-#define SXACT_FLAG_DOOMED				0x00000008		/* will roll back */
+#define SXACT_FLAG_COMMITTED			0x00000001	/* already committed */
+#define SXACT_FLAG_PREPARED				0x00000002	/* about to commit */
+#define SXACT_FLAG_ROLLED_BACK			0x00000004	/* already rolled back */
+#define SXACT_FLAG_DOOMED				0x00000008	/* will roll back */
 /*
  * The following flag actually means that the flagged transaction has a
  * conflict out *to a transaction which committed ahead of it*.  It's hard
@@ -153,25 +153,24 @@ typedef struct PredXactListData
 	 * but are not needed outside the predicate.c source file. Protected by
 	 * SerializableXactHashLock.
 	 */
-	TransactionId SxactGlobalXmin;		/* global xmin for active serializable
-										 * transactions */
+	TransactionId SxactGlobalXmin;	/* global xmin for active serializable
+									 * transactions */
 	int			SxactGlobalXminCount;	/* how many active serializable
 										 * transactions have this xmin */
-	int			WritableSxactCount;		/* how many non-read-only serializable
-										 * transactions are active */
-	SerCommitSeqNo LastSxactCommitSeqNo;		/* a strictly monotonically
-												 * increasing number for
-												 * commits of serializable
-												 * transactions */
+	int			WritableSxactCount; /* how many non-read-only serializable
+									 * transactions are active */
+	SerCommitSeqNo LastSxactCommitSeqNo;	/* a strictly monotonically
+											 * increasing number for commits
+											 * of serializable transactions */
 	/* Protected by SerializableXactHashLock. */
-	SerCommitSeqNo CanPartialClearThrough;		/* can clear predicate locks
-												 * and inConflicts for
-												 * committed transactions
-												 * through this seq no */
+	SerCommitSeqNo CanPartialClearThrough;	/* can clear predicate locks and
+											 * inConflicts for committed
+											 * transactions through this seq
+											 * no */
 	/* Protected by SerializableFinishedListLock. */
 	SerCommitSeqNo HavePartialClearedThrough;	/* have cleared through this
 												 * seq no */
-	SERIALIZABLEXACT *OldCommittedSxact;		/* shared copy of dummy sxact */
+	SERIALIZABLEXACT *OldCommittedSxact;	/* shared copy of dummy sxact */
 
 	PredXactListElement element;
 }			PredXactListData;
@@ -477,4 +476,4 @@ extern PredicateLockData *GetPredicateLockStatusData(void);
 extern int GetSafeSnapshotBlockingPids(int blocked_pid,
 							int *output, int output_size);
 
-#endif   /* PREDICATE_INTERNALS_H */
+#endif							/* PREDICATE_INTERNALS_H */