Commit04aabb0

committed

Clean up WIN32_CONSOLE code.

1 parent248af40 commit04aabb0Copy full SHA for 04aabb0

File tree

+11

-13

lines changed

+11

-13

lines changed

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.29 2003/08/26 18:35:31 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.30 2003/09/05 02:31:10 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"input.h"`
`@@ -45,16 +45,6 @@ static void finishInput(int, void *);`
`45`	`45`	`#definePSQLHISTORY ".psql_history"`
`46`	`46`
`47`	`47`
`48`		`-#ifdefWIN32`
`49`		`-`
`50`		`-/*`
`51`		`- * translate DOS console character set into ANSI, needed e.g. for German`
`52`		`- * umlauts`
`53`		`- */`
`54`		`-if (GetVariableBool(pset.vars,"WIN32_CONSOLE"))`
`55`		`-OemToChar(s,s);`
`56`		`-#endif`
`57`		`-`
`58`	`48`	`#ifdefUSE_READLINE`
`59`	`49`	`staticenumhistcontrol`
`60`	`50`	`GetHistControlConfig(void)`
`@@ -109,6 +99,15 @@ gets_interactive(const char *prompt)`
`109`	`99`	`else`
`110`	`100`	`s=gets_basic(prompt);`
`111`	`101`
	`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`	`+`
`112`	`111`	`if (useHistory&&s&&s[0])`
`113`	`112`	`{`
`114`	`113`	`enumhistcontrolHC;`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.9 2003/08/04 23:59:40 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/mbprint.c,v 1.10 2003/09/05 02:31:10 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`#include"postgres_fe.h"`
`@@ -335,7 +335,6 @@ mbvalidate(unsigned char *pwcs, int encoding)`
`335`	`335`	`else`
`336`	`336`	`{`
`337`	`337`	`#ifdefWIN32`
`338`		`-`
`339`	`338`	`/*`
`340`	`339`	`* translate characters to DOS console encoding, e.g. needed for`
`341`	`340`	`* German umlauts`

Comments

(0)