Fix build failure when not USE_READLINE. Sergey E. Koposov

tglsfdc · tglsfdc · commit 562f63b0a7ca · 2006-02-13T14:57:15.000Z
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.48 2006/02/12 05:24:38 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.49 2006/02/13 14:57:15 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -213,7 +213,8 @@ gets_fromFile(FILE *source)
 }
 
 
-static void encode_history()
+#ifdef USE_READLINE
+static void encode_history(void)
 {
 	HIST_ENTRY *cur_hist;
 	char *cur_ptr;
@@ -225,7 +226,7 @@ static void encode_history()
 				*cur_ptr = NL_IN_HISTORY;
 }
 
-static void decode_history()
+static void decode_history(void)
 {
 	HIST_ENTRY *cur_hist;
 	char *cur_ptr;
@@ -236,6 +237,7 @@ static void decode_history()
 			if (*cur_ptr == NL_IN_HISTORY)
 				*cur_ptr = '\n';
 }
+#endif /* USE_READLINE */
 
 
 /*
@@ -290,7 +292,6 @@ initializeInput(int flags)
 }
 
 
-
 bool
 saveHistory(char *fname)
 {
@@ -311,7 +312,6 @@ saveHistory(char *fname)
 }
 
 
-
 static void
 #ifdef HAVE_ATEXIT
 finishInput(void)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.48 2006/02/12 05:24:38 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.49 2006/02/13 14:57:15 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -213,7 +213,8 @@ gets_fromFile(FILE *source)`
`213`	`213`	`}`
`214`	`214`
`215`	`215`
`216`		`-static void encode_history()`
	`216`	`+#ifdef USE_READLINE`
	`217`	`+static void encode_history(void)`
`217`	`218`	`{`
`218`	`219`	`HIST_ENTRY *cur_hist;`
`219`	`220`	`char *cur_ptr;`
`@@ -225,7 +226,7 @@ static void encode_history()`
`225`	`226`	`*cur_ptr = NL_IN_HISTORY;`
`226`	`227`	`}`
`227`	`228`
`228`		`-static void decode_history()`
	`229`	`+static void decode_history(void)`
`229`	`230`	`{`
`230`	`231`	`HIST_ENTRY *cur_hist;`
`231`	`232`	`char *cur_ptr;`
`@@ -236,6 +237,7 @@ static void decode_history()`
`236`	`237`	`if (*cur_ptr == NL_IN_HISTORY)`
`237`	`238`	`*cur_ptr = '\n';`
`238`	`239`	`}`
	`240`	`+#endif /* USE_READLINE */`
`239`	`241`
`240`	`242`
`241`	`243`	`/*`
`@@ -290,7 +292,6 @@ initializeInput(int flags)`
`290`	`292`	`}`
`291`	`293`
`292`	`294`
`293`		`-`
`294`	`295`	`bool`
`295`	`296`	`saveHistory(char *fname)`
`296`	`297`	`{`
`@@ -311,7 +312,6 @@ saveHistory(char *fname)`
`311`	`312`	`}`
`312`	`313`
`313`	`314`
`314`		`-`
`315`	`315`	`static void`
`316`	`316`	`#ifdef HAVE_ATEXIT`
`317`	`317`	`finishInput(void)`