From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Tue, 1 Mar 2016 02:36:41 +0000 (+0100)
Subject: fix a few violations of ISO C90 (mixed code/declarations)
X-Git-Tag: XL9_5_R1BETA2~31
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=5fa02b90ca95c50897495c0f0b47dfeb4835cb3b;p=postgres-xl.git

fix a few violations of ISO C90 (mixed code/declarations)

Interestingly ';;' confuses the compiler enough to emit this warning.
---

diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 2e1e234a32..fb558376a0 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -1308,8 +1308,11 @@ find_push_down_plan_int(PlannerInfo *root, Plan *plan, bool force, bool delete,
 		 */
 		if ((((Plan *)remote_plan) == subplan) && parent)
 		{
+			RelOptInfo *rel = NULL;
+
 			Assert(root);
-			RelOptInfo *rel = find_base_rel(root, ((SubqueryScan *)plan)->scan.scanrelid);
+
+			rel = find_base_rel(root, ((SubqueryScan *)plan)->scan.scanrelid);
 			rel->subplan = ((SubqueryScan *)plan)->subplan;
 		}
 		return remote_plan;
diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c
index 21d73b8576..ed971351ef 100644
--- a/src/gtm/main/gtm_txn.c
+++ b/src/gtm/main/gtm_txn.c
@@ -887,7 +887,7 @@ GTM_BkupBeginTransactionMulti(GTM_IsolationLevel *isolevel,
 							  GTMProxy_ConnID *connid,
 							  int	txn_count)
 {
-	GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS];;
+	GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS];
 	MemoryContext oldContext;
 	int count;
 
@@ -1393,7 +1393,7 @@ GTM_BkupBeginTransactionGetGXIDMulti(GlobalTransactionId *gxid,
 									 GTMProxy_ConnID *connid,
 									 int txn_count)
 {
-	GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS];;
+	GTM_TransactionHandle txn[GTM_MAX_GLOBAL_TRANSACTIONS];
 	GTM_TransactionInfo *gtm_txninfo;
 	int ii;
 	int count;