Commit374b2b0

committed

Why can't everyone be standard? :(

Add some code to make psql happy with a system where there is *no*history code available, but there is readline code...

1 parentd049cec commit374b2b0Copy full SHA for 374b2b0

File tree

+13

-3

lines changed

+13

-3

lines changed

Lines changed: 3 additions & 3 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.51 1997/01/2521:58:08 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.52 1997/01/2522:16:36 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -35,12 +35,12 @@`
`35`	`35`	`#else`
`36`	`36`	`# ifdefHAVE_READLINE_H`
`37`	`37`	`# include<readline.h>`
`38`		`-#ifdefHAVE_HISTORY_H`
	`38`	`+#ifndefNO_HISTORY`
`39`	`39`	`# include<history.h>`
`40`	`40`	`# endif`
`41`	`41`	`# else`
`42`	`42`	`# include<readline/readline.h>`
`43`		`-#ifdefHAVE_READLINE_HISTORY_H`
	`43`	`+#ifndefNO_HISTORY`
`44`	`44`	`# include<readline/history.h>`
`45`	`45`	`# endif`
`46`	`46`	`# endif`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,16 @@`
`23`	`23`	`/* #undef HAVE_HISTORY_H */`
`24`	`24`	`/* #undef HAVE_READLINE_HISTORY_H */`
`25`	`25`
	`26`	`+/* this is meant to handle the condition where the system has readline`
	`27`	`+ * capabilities, but no history. Unfortunately, it isn't as simple as`
	`28`	`+ * testing for the existance of -lhistory, since newer -lreadline seems to`
	`29`	`+ * include the -lhistory library, but newer readline.h doesn't`
	`30`	`+ */`
	`31`	`+#if defined(HAVE_LIBREADLINE)`
	`32`	`+# if !defined(HAVE_HISTORY_H)\|\| !defined(HAVE_READLINE_HISTORY_H)`
	`33`	`+# defineNO_HISTORY_H`
	`34`	`+# endif`
	`35`	`+#endif`
`26`	`36`
`27`	`37`	`#defineHAVE_SYS_SELECT_H`
`28`	`38`	`#defineHAVE_TERMIOS_H`

Comments

(0)