NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitbf7427b

committed

Minimal portability fix for commite1551f9.

Older gcc versions are not happy with having multiple declarationsfor the same typedef name (not struct name). I'm a bit dubiousas to how well-thought-out that patch was at all, but for the momentjust fix it enough so I can get some work done today.Discussion:https://postgr.es/m/20191218101338.GB325369@paquier.xyz

1 parentecb09cd commitbf7427bCopy full SHA for bf7427b

File tree

2 files changed

-4

lines changed

src/include
- parser
  - parse_utilcmd.h
- rewrite
  - rewriteManip.h

2 files changed

-4

lines changed

`‎src/include/parser/parse_utilcmd.h`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@`
`16`	`16`
`17`	`17`	`#include"parser/parse_node.h"`
`18`	`18`
`19`		`-typedefstructAttrMapAttrMap;`
	`19`	`+structAttrMap;/* avoid including attmap.h here */`
	`20`	`+`
`20`	`21`
`21`	`22`	`externListtransformCreateStmt(CreateStmtstmt,constchar*queryString);`
`22`	`23`	`externListtransformAlterTableStmt(Oidrelid,AlterTableStmtstmt,`
`@@ -30,7 +31,7 @@ extern PartitionBoundSpec transformPartitionBound(ParseState pstate, Relation`
`30`	`31`	`PartitionBoundSpec*spec);`
`31`	`32`	`externIndexStmtgenerateClonedIndexStmt(RangeVarheapRel,`
`32`	`33`	`Relationsource_idx,`
`33`		`-constAttrMap*attmap,`
	`34`	`+conststructAttrMap*attmap,`
`34`	`35`	`Oid*constraintOid);`
`35`	`36`
`36`	`37`	`#endif/* PARSE_UTILCMD_H */`

`‎src/include/rewrite/rewriteManip.h`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,9 @@`
`16`	`16`
`17`	`17`	`#include"nodes/parsenodes.h"`
`18`	`18`
	`19`	`+structAttrMap;/* avoid including attmap.h here */`
	`20`	`+`
`19`	`21`
`20`		`-typedefstructAttrMapAttrMap;`
`21`	`22`	`typedefstructreplace_rte_variables_contextreplace_rte_variables_context;`
`22`	`23`
`23`	`24`	`typedefNode(replace_rte_variables_callback) (Var*var,`
`@@ -72,7 +73,7 @@ extern Node replace_rte_variables_mutator(Node node,`
`72`	`73`
`73`	`74`	`externNodemap_variable_attnos(Nodenode,`
`74`	`75`	`inttarget_varno,intsublevels_up,`
`75`		`-constAttrMap*attno_map,`
	`76`	`+conststructAttrMap*attno_map,`
`76`	`77`	`Oidto_rowtype,bool*found_whole_row);`
`77`	`78`
`78`	`79`	`externNodeReplaceVarsFromTargetList(Nodenode,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbf7427b

File tree

2 files changed

2 files changed

`‎src/include/parser/parse_utilcmd.h`

`‎src/include/rewrite/rewriteManip.h`

0 commit comments