diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-09-12 02:40:10 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-09-12 02:40:10 +0000 |
| commit | 9182481bea3b72eb7ea60d8fcc0b0c6ccd179fc5 (patch) | |
| tree | bb7a7ee195a4ef07bee37386ca9123b566f52768 /src | |
| parent | aaafbdcfd30a1513f35fb8741f7a05acd66b9f80 (diff) | |
| download | postgresql-9182481bea3b72eb7ea60d8fcc0b0c6ccd179fc5.tar.gz postgresql-9182481bea3b72eb7ea60d8fcc0b0c6ccd179fc5.zip | |
Remove WIN32_CONSOLE support, at the request of the author.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/input.c | 11 | ||||
| -rw-r--r-- | src/bin/psql/mbprint.c | 11 | ||||
| -rw-r--r-- | src/bin/scripts/Makefile | 4 |
3 files changed, 4 insertions, 22 deletions
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c index 0dec1974001..085c95c6351 100644 --- 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 ca4ba820f7c..f8560f81665 100644 --- 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 ff51db5e3b6..9c31d92b44b 100644 --- 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) |