Commit418d04e

committed

Improve method of avoiding fcinfo compile errors.

Fix pgrminclude C comment marker.

1 parente4df037 commit418d04eCopy full SHA for 418d04e

File tree

+23

-13

lines changed

+23

-13

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#ifndefHBA_H`
`12`	`12`	`#defineHBA_H`
`13`	`13`
`14`		`-#include"libpq/pqcomm.h"/* pgrmincluderemove // needed for NetBSD */`
	`14`	`+#include"libpq/pqcomm.h"/* pgrmincludeignore // needed for NetBSD */`
`15`	`15`	`#include"nodes/pg_list.h"`
`16`	`16`
`17`	`17`

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,20 @@ find . $ -name .git -a -prune $ -o -name '*.h' -type f -print \| while read FIL`
`13`	`13`	`do`
`14`	`14`	`sed 's/->[a-zA-Z0-9_\.]*//g' "$FILE" >/tmp/$$a`
`15`	`15`	`echo "#include \"postgres.h\"" >/tmp/$$.c`
`16`		`-echo "#include \"/tmp/$$a\"" >>/tmp/$$.c`
	`16`	`+`
`17`	`17`	`# supress fcinfo errors`
`18`		`-echo "#undef PG_GETARG_DATUM" >>/tmp/$$.c`
`19`		`-echo "#define PG_GETARG_DATUM(n)" >>/tmp/$$.c`
`20`		`-echo "void include_test(void);" >>/tmp/$$.c`
`21`		`-echo "void include_test() {" >>/tmp/$$.c`
	`18`	`+echo "struct {Datum arg[1];} *fcinfo;" >>/tmp/$$.c`
	`19`	`+`
	`20`	`+echo "#include \"/tmp/$$a\"" >>/tmp/$$.c`
	`21`	`+`
	`22`	`+echo "Datum include_test(void);" >>/tmp/$$.c`
	`23`	`+echo "Datum include_test() {" >>/tmp/$$.c`
	`24`	`+`
`22`	`25`	`pgdefine "$FILE" >>/tmp/$$.c`
	`26`	`+`
	`27`	`+echo "return (Datum)0;" >>/tmp/$$.c`
`23`	`28`	`echo "}" >>/tmp/$$.c`
	`29`	`+`
`24`	`30`	`# Use -O1 to get warnings only generated by optimization,`
`25`	`31`	`# but -O2 is too slow.`
`26`	`32`	`cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,8 @@ do`
`18`	`18`	`sed 's/([a-zA-Z0-9_ ]*,/(0,/g' \|`
`19`	`19`	`sed 's/,[a-zA-Z0-9_ ]*,/,0,/g' \|`
`20`	`20`	`sed 's/,[a-zA-Z0-9_ ]*)/,0)/g' \|`
	`21`	`+# do not cast 'return' macros as (void)`
	`22`	`+sed 's/(=void)$.*return$/\1/g' \|`
	`23`	`+sed 's/(=void)$.*RETURN$/\1/g' \|`
`21`	`24`	`sed 's/(=void)/(void)/g'`
`22`	`25`	`done`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,19 +68,20 @@ compile_file() {`
`68`	`68`
`69`	`69`	`if [ "$IS_INCLUDE" = "Y" ]`
`70`	`70`	`thenecho "#include \"postgres.h\"" >/tmp/$$.c`
	`71`	`+# supress fcinfo errors`
	`72`	`+echo "struct {Datum arg[1];} *fcinfo;" >>/tmp/$$.c`
`71`	`73`	`else>/tmp/$$.c`
`72`	`74`	`fi`
`73`	`75`
`74`	`76`	`echo "#include \"/tmp/$$b\"" >>/tmp/$$.c`
`75`		`-# supress fcinfo errors`
`76`		`-echo "#undef PG_GETARG_DATUM" >>/tmp/$$.c`
`77`		`-echo "#define PG_GETARG_DATUM(n)" >>/tmp/$$.c`
`78`		`-echo "void include_test(void);" >>/tmp/$$.c`
`79`		`-echo "void include_test() {" >>/tmp/$$.c`
	`77`	`+`
`80`	`78`	`if [ "$IS_INCLUDE" = "Y" ]`
`81`		`-thenpgdefine "$FILE" >>/tmp/$$.c`
	`79`	`+thenecho "Datum include_test(void);" >>/tmp/$$.c`
	`80`	`+echo "Datum include_test() {" >>/tmp/$$.c`
	`81`	`+pgdefine "$FILE" >>/tmp/$$.c`
	`82`	`+echo "return (Datum)0;" >>/tmp/$$.c`
	`83`	`+echo "}" >>/tmp/$$.c`
`82`	`84`	`fi`
`83`		`-echo "}" >>/tmp/$$.c`
`84`	`85`
`85`	`86`	`# Use -O1 to get warnings only generated by optimization,`
`86`	`87`	`# but -O2 is too slow.`

Comments

(0)

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,20 @@ find . \( -name .git -a -prune \) -o -name '*.h' -type f -print \| while read FIL`
`13`	`13`	`do`
`14`	`14`	`sed 's/->[a-zA-Z0-9_\.]*//g' "$FILE" >/tmp/$$a`
`15`	`15`	`echo "#include \"postgres.h\"" >/tmp/$$.c`
`16`		`-echo "#include \"/tmp/$$a\"" >>/tmp/$$.c`
	`16`	`+`
`17`	`17`	`# supress fcinfo errors`
`18`		`-echo "#undef PG_GETARG_DATUM" >>/tmp/$$.c`
`19`		`-echo "#define PG_GETARG_DATUM(n)" >>/tmp/$$.c`
`20`		`-echo "void include_test(void);" >>/tmp/$$.c`
`21`		`-echo "void include_test() {" >>/tmp/$$.c`
	`18`	`+echo "struct {Datum arg[1];} *fcinfo;" >>/tmp/$$.c`
	`19`	`+`
	`20`	`+echo "#include \"/tmp/$$a\"" >>/tmp/$$.c`
	`21`	`+`
	`22`	`+echo "Datum include_test(void);" >>/tmp/$$.c`
	`23`	`+echo "Datum include_test() {" >>/tmp/$$.c`
	`24`	`+`
`22`	`25`	`pgdefine "$FILE" >>/tmp/$$.c`
	`26`	`+`
	`27`	`+echo "return (Datum)0;" >>/tmp/$$.c`
`23`	`28`	`echo "}" >>/tmp/$$.c`
	`29`	`+`
`24`	`30`	`# Use -O1 to get warnings only generated by optimization,`
`25`	`31`	`# but -O2 is too slow.`
`26`	`32`	`cc -fsyntax-only -Werror -Wall -Wmissing-prototypes \`