Remove WIN32_CONSOLE support, at the request of the author.

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 1d6da0e3b2d98d7fa98a1d6a1ffff26ccdc9bd5f..784cc06a414c88a72dd01928d6c1cdaa6850b3d2 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -2073,19 +2073,6 @@ bar
    
       
 
-      
-        WIN32_CONSOLE
-   
-   
-        This variable is only useful when working under the Win32 command
-        console. As the Win32 command console uses a different encoding than
-        the rest of the Windows system.  Eight-bit characters (e.g. German Umlauts)
-        are corrupted. When this variable is set the command console encoding will
-        be translated into ASCII encoding for input and output. 
-   
-   
-      
-
     
 
    

diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 0dec1974001b6afb7469ea2696ca269235e1e637..085c95c635138ebaabcde75277216323ddb0714d 100644 (file)
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.30 2003/09/05 02:31:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.31 2003/09/12 02:40:09 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "input.h"
@@ -99,15 +99,6 @@ gets_interactive(const char *prompt)
    else
        s = gets_basic(prompt);
 
-#ifdef WIN32
-    /*
-     * translate DOS console character set into ANSI, needed e.g. for German
-     * umlauts
-     */
-   if (GetVariableBool(pset.vars, "WIN32_CONSOLE"))
-       OemToChar(s, s);
-#endif
-
    if (useHistory && s && s[0])
    {
        enum histcontrol HC;

diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c
index ca4ba820f7c1b5410943189857f217f9bd1cf8d4..f8560f816654223f7b817dfc4caaf6a560a27877 100644 (file)
--- a/src/bin/psql/mbprint.c
+++ b/src/bin/psql/mbprint.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.11 2003/09/07 03:43:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.12 2003/09/12 02:40:09 momjian Exp $
  */
 
 #include "postgres_fe.h"
@@ -337,15 +337,6 @@ mbvalidate(unsigned char *pwcs, int encoding)
        return mb_utf_validate(pwcs);
    else
    {
-#if defined(WIN32) && !defined(PGSCRIPTS)
-       /*
-        * translate characters to DOS console encoding, e.g. needed for
-        * German umlauts
-        */
-       if (GetVariableBool(pset.vars, "WIN32_CONSOLE"))
-           CharToOem(pwcs, pwcs);
-#endif
-
        /*
         * other encodings needing validation should add their own
         * routines here

diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index ff51db5e3b65cf8be2b3022e101a7b26d75e7d3f..9c31d92b44b943762352e6ef37293f237ffb2814 100644 (file)
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.23 2003/09/07 03:43:55 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.24 2003/09/12 02:40:10 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
 
 PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb
 
-override CPPFLAGS := -DPGSCRIPTS -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
 
 all: submake-libpq submake-backend $(PROGRAMS)