Commitb7e2050

committed

Hide explicit setting of UTF8 under #ifdef HAVE_WIN32_LIBEDIT

1 parent808b400 commitb7e2050Copy full SHA for b7e2050

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1708,7 +1708,13 @@ do_connect(char dbname, char user, char host, char port)`
`1708`	`1708`	`keywords[++paramnum]="fallback_application_name";`
`1709`	`1709`	`values[paramnum]=pset.progname;`
`1710`	`1710`	`keywords[++paramnum]="client_encoding";`
`1711`		`-values[paramnum]= (pset.notty\|\|getenv("PGCLIENTENCODING")) ?NULL :"UTF8";`
	`1711`	`+values[paramnum]= (pset.notty\|\|getenv("PGCLIENTENCODING")) ?NULL :`
	`1712`	`+#ifdefHAVE_WIN32_LIBEDIT`
	`1713`	`+"UTF8"`
	`1714`	`+#else`
	`1715`	`+"auto"`
	`1716`	`+#endif`
	`1717`	`+;`
`1712`	`1718`
`1713`	`1719`	`/* add array terminator */`
`1714`	`1720`	`keywords[++paramnum]=NULL;`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,13 @@ main(int argc, char *argv[])`
`231`	`231`	`keywords[5]="fallback_application_name";`
`232`	`232`	`values[5]=pset.progname;`
`233`	`233`	`keywords[6]="client_encoding";`
`234`		`-values[6]= (pset.notty\|\|getenv("PGCLIENTENCODING")) ?NULL :"UTF8";`
	`234`	`+values[6]= (pset.notty\|\|getenv("PGCLIENTENCODING")) ?NULL :`
	`235`	`+#ifdefHAVE_WIN32_LIBEDIT`
	`236`	`+"UTF8"`
	`237`	`+#else`
	`238`	`+"auto"`
	`239`	`+#endif`
	`240`	`+;`
`235`	`241`	`keywords[7]=NULL;`
`236`	`242`	`values[7]=NULL;`
`237`	`243`

Comments

(0)