From bd6f98af312d464b0052c244832c5f183cfd9575 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 19 Mar 1999 18:56:43 +0000
Subject: [PATCH] I suggest the following portability patch, which does not
 change functionality, but makes the code more ANSI C'ish. My AIX xlc compiler
 barfs on all of these. Can someone please review and apply to current.

 <<port.patch>>
Thanks
Andreas
---
 src/backend/executor/execMain.c      |  5 +++--
 src/backend/optimizer/plan/planner.c | 10 +++++-----
 src/include/utils/ps_status.h        |  4 ++--
 src/interfaces/ecpg/lib/ecpglib.c    |  4 +++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 5180486b8b6..962c235818d 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.79 1999/02/22 19:40:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.80 1999/03/19 18:56:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1724,7 +1724,8 @@ EvalPlanQual(EState *estate, Index rti, ItemPointer tid)
 		}
 		/* push current PQ to the stack */
 		epqstate->es_evalPlanQual = (Pointer) epq;
-		estate->es_evalPlanQual = (Pointer) epq = newepq;
+		epq = newepq;
+		estate->es_evalPlanQual = (Pointer) epq;
 		epq->rti = rti;
 		endNode = false;
 	}
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 1847c2d986e..27d5892ee0c 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.45 1999/02/21 03:48:49 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.46 1999/03/19 18:56:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -283,20 +283,20 @@ union_planner(Query *parse)
 		    
 
 		    /* convert the havingQual to conjunctive normal form (cnf) */
-		    (List *) parse->havingQual=cnfify((Expr *)(Node *) parse->havingQual,true);
+		    parse->havingQual = (Node *) cnfify((Expr *)(Node *) parse->havingQual,true);
 
 		    /* There is a subselect in the havingQual, so we have to process it
                      * using the same function as for a subselect in 'where' */
 		    if (parse->hasSubLinks)
 		      {
-			(List *) parse->havingQual = 
-			  (List *) SS_process_sublinks((Node *) parse->havingQual);
+			parse->havingQual = 
+			  (Node *) SS_process_sublinks((Node *) parse->havingQual);
 		      }
 		    		    
 		    
 		    /* Calculate the opfids from the opnos (=select the correct functions for
 		     * the used VAR datatypes) */
-		    (List *) parse->havingQual=fix_opids((List *) parse->havingQual);
+		    parse->havingQual = (Node *) fix_opids((List *) parse->havingQual);
 		    
 		    ((Agg *) result_plan)->plan.qual=(List *) parse->havingQual;
 
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 9a74d2c3501..c68020ac08c 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -20,7 +20,7 @@
 extern char *ps_status_buffer;
 
 #define PS_DEFINE_BUFFER \
-char *ps_status_buffer = NULL;
+char *ps_status_buffer = NULL
 
 #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
 	{ \
@@ -53,7 +53,7 @@ char *ps_status_buffer = NULL;
 extern const char **ps_status;
 
 #define PS_DEFINE_BUFFER \
-const char **ps_status = NULL;
+const char **ps_status = NULL
 
 #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
 	{ \
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
index 8f60b0fc3e0..742cc5a1d8d 100644
--- a/src/interfaces/ecpg/lib/ecpglib.c
+++ b/src/interfaces/ecpg/lib/ecpglib.c
@@ -741,7 +741,9 @@ ECPGexecute(struct statement * stmt)
 							break;
 					    }
 					    
-					    add_mem((void *)(var->value) = *((void **)(var->pointer)) = (void *) ecpg_alloc(len, stmt->lineno), stmt->lineno);
+					    var->pointer = (void *) ecpg_alloc(len, stmt->lineno);
+					    var->value = (void **) var->pointer;
+					    add_mem((void *) var->value, stmt->lineno);
 					}
 									
 					for (act_tuple = 0; act_tuple < ntuples && status; act_tuple++)