Cleaning GCC warnings.

vadim4o · vadim4o · commit d8949adc209f · 1997-12-26T06:02:26.000Z
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.13 1997/12/24 06:06:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.14 1997/12/26 06:02:26 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@
 #include "optimizer/prep.h"
 #include "optimizer/plancat.h"
 #include "optimizer/planner.h"
-#include "optimizer/prep.h"
+#include "optimizer/planmain.h"
 
 static List *plan_union_query(List *relids, Index rt_index,
 				 RangeTblEntry *rt_entry, Query *parse, UnionFlag flag,
@@ -203,6 +203,8 @@ plan_union_queries(Index rt_index,
 			/* do nothing */
 			break;
 	}
+	
+	return ((Append*)NULL);		/* to make gcc happy */
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.13 1997/12/24 06:06:07 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.14 1997/12/26 06:02:26 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include "optimizer/prep.h"`
`32`	`32`	`#include "optimizer/plancat.h"`
`33`	`33`	`#include "optimizer/planner.h"`
`34`		`-#include "optimizer/prep.h"`
	`34`	`+#include "optimizer/planmain.h"`
`35`	`35`
`36`	`36`	`static List plan_union_query(List relids, Index rt_index,`
`37`	`37`	`RangeTblEntry rt_entry, Query parse, UnionFlag flag,`
`@@ -203,6 +203,8 @@ plan_union_queries(Index rt_index,`
`203`	`203`	`/* do nothing */`
`204`	`204`	`break;`
`205`	`205`	`}`
	`206`	`+`
	`207`	`+ return ((Append)NULL); / to make gcc happy */`
`206`	`208`	`}`
`207`	`209`
`208`	`210`