Commitf389e9d

committed

Change how readline support is included in psql.c ...

See message to hackers@ mailing list concerning this...

1 parent6dbe1be commitf389e9dCopy full SHA for f389e9d

File tree

+21

-11

lines changed

+21

-11

lines changed

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.49 1997/01/13 02:35:32 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.50 1997/01/25 03:51:59 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -30,17 +30,16 @@`
`30`	`30`	`#include"strdup.h"`
`31`	`31`	`#endif`
`32`	`32`
`33`		`-#ifdefNOREADLINE`
`34`		`-#include"rlstubs.h"`
	`33`	`+#ifndefHAVE_LIBREADLINE`
	`34`	`+#include"rlstubs.h"`
`35`	`35`	`#else`
`36`		`-/* from the GNU readline library */`
`37`		`-#ifdefOLD_READLINE`
`38`		`-#include"readline.h"`
`39`		`-#include"history.h"`
`40`		`-#else`
`41`		`-#include<readline/readline.h>`
`42`		`-#include<readline/history.h>`
`43`		`-#endif`
	`36`	`+# ifdefHAVE_READLINE_H`
	`37`	`+# include<readline.h>`
	`38`	`+# include<history.h>`
	`39`	`+# else`
	`40`	`+# include<readline/readline.h>`
	`41`	`+# include<readline/history.h>`
	`42`	`+# endif`
`44`	`43`	`#endif`
`45`	`44`
`46`	`45`	`#definePROMPT "=> "`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,17 @@`
`8`	`8`
`9`	`9`	`#defineBLCKSZ8192`
`10`	`10`
	`11`	`+/* Define to enable readline/history support in psql */`
	`12`	`+/* #undef HAVE_LIBREADLINE */`
	`13`	`+`
	`14`	`+/* These two defines are not used until HAVE_LIBREADLINE`
	`15`	`+ * are also defined`
	`16`	`+ *`
	`17`	`+ * Define if <readline.h> vs <readline/readline.h>`
	`18`	`+ */`
	`19`	`+/* #undef HAVE_READLINE_H */`
	`20`	`+`
	`21`	`+`
`11`	`22`	`#defineHAVE_SYS_SELECT_H`
`12`	`23`	`#defineHAVE_TERMIOS_H`
`13`	`24`	`#defineHAVE_VALUES_H`

Comments

(0)