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

Commitcb8d423

Browse files
committed
Remove WIN32 console.
1 parent74e1bfe commitcb8d423

File tree

4 files changed

+5
-36
lines changed

4 files changed

+5
-36
lines changed

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.94.2.1 2003/09/07 04:36:46 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.94.2.2 2003/09/12 02:46:00 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -2073,19 +2073,6 @@ bar
20732073
</listitem>
20742074
</varlistentry>
20752075

2076-
<varlistentry>
2077-
<term><varname>WIN32_CONSOLE</varname></term>
2078-
<listitem>
2079-
<para>
2080-
This variable is only useful when working under the Win32 command
2081-
console. As the Win32 command console uses a different encoding than
2082-
the rest of the Windows system. Eight-bit characters (e.g. German Umlauts)
2083-
are corrupted. When this variable is set the command console encoding will
2084-
be translated into ASCII encoding for input and output.
2085-
</para>
2086-
</listitem>
2087-
</varlistentry>
2088-
20892076
</variablelist>
20902077

20912078
</refsect3>

‎src/bin/psql/input.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.28.2.1 2003/09/07 04:37:04 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.28.2.2 2003/09/12 02:46:03 momjian Exp $
77
*/
88
#include"postgres_fe.h"
99
#include"input.h"
@@ -99,15 +99,6 @@ gets_interactive(const char *prompt)
9999
else
100100
s=gets_basic(prompt);
101101

102-
#ifdefWIN32
103-
/*
104-
* translate DOS console character set into ANSI, needed e.g. for German
105-
* umlauts
106-
*/
107-
if (GetVariableBool(pset.vars,"WIN32_CONSOLE"))
108-
OemToChar(s,s);
109-
#endif
110-
111102
if (useHistory&&s&&s[0])
112103
{
113104
enumhistcontrolHC;

‎src/bin/psql/mbprint.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.9.2.1 2003/09/07 04:37:04 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.9.2.2 2003/09/12 02:46:03 momjian Exp $
77
*/
88

99
#include"postgres_fe.h"
@@ -337,15 +337,6 @@ mbvalidate(unsigned char *pwcs, int encoding)
337337
returnmb_utf_validate(pwcs);
338338
else
339339
{
340-
#if defined(WIN32)&& !defined(PGSCRIPTS)
341-
/*
342-
* translate characters to DOS console encoding, e.g. needed for
343-
* German umlauts
344-
*/
345-
if (GetVariableBool(pset.vars,"WIN32_CONSOLE"))
346-
CharToOem(pwcs,pwcs);
347-
#endif
348-
349340
/*
350341
* other encodings needing validation should add their own
351342
* routines here

‎src/bin/scripts/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.22.2.1 2003/09/07 04:37:04 momjian Exp $
8+
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.22.2.2 2003/09/12 02:46:03 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
1515

1616
PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb
1717

18-
overrideCPPFLAGS := -DPGSCRIPTS -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir)$(CPPFLAGS)
18+
overrideCPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir)$(CPPFLAGS)
1919

2020
all: submake-libpq submake-backend$(PROGRAMS)
2121

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp