Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb7e2050

Browse files
committed
Hide explicit setting of UTF8 under #ifdef HAVE_WIN32_LIBEDIT
1 parent808b400 commitb7e2050

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

‎src/bin/psql/command.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1708,7 +1708,13 @@ do_connect(char *dbname, char *user, char *host, char *port)
17081708
keywords[++paramnum]="fallback_application_name";
17091709
values[paramnum]=pset.progname;
17101710
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+
;
17121718

17131719
/* add array terminator */
17141720
keywords[++paramnum]=NULL;

‎src/bin/psql/startup.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,13 @@ main(int argc, char *argv[])
231231
keywords[5]="fallback_application_name";
232232
values[5]=pset.progname;
233233
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+
;
235241
keywords[7]=NULL;
236242
values[7]=NULL;
237243

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp