NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit9b708f1

committed

Fix inclusions of readline/editline header files so that we only attempt to

#include the version of history.h that is in the same directory as thereadline.h we are using. This avoids problems in some scenarios where bothreadline and editline are installed. Report and patch by Zdenek Kotala.

1 parent1e6bd55 commit9b708f1Copy full SHA for 9b708f1

File tree

1 file changed

+14

-8

lines changed

src/bin/psql
- input.h

1 file changed

+14

-8

lines changed

`‎src/bin/psql/input.h`

Lines changed: 14 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.31 2009/01/01 17:23:55 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.32 2009/08/24 16:18:13 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndefINPUT_H`
`9`	`9`	`#defineINPUT_H`
`@@ -16,21 +16,27 @@`
`16`	`16`	`*/`
`17`	`17`	`#ifdefHAVE_LIBREADLINE`
`18`	`18`	`#defineUSE_READLINE 1`
	`19`	`+`
`19`	`20`	`#if defined(HAVE_READLINE_READLINE_H)`
`20`	`21`	`#include<readline/readline.h>`
	`22`	`+#if defined(HAVE_READLINE_HISTORY_H)`
	`23`	`+#include<readline/history.h>`
	`24`	`+#endif`
	`25`	`+`
`21`	`26`	`#elif defined(HAVE_EDITLINE_READLINE_H)`
`22`	`27`	`#include<editline/readline.h>`
	`28`	`+#if defined(HAVE_EDITLINE_HISTORY_H)`
	`29`	`+#include<editline/history.h>`
	`30`	`+#endif`
	`31`	`+`
`23`	`32`	`#elif defined(HAVE_READLINE_H)`
`24`	`33`	`#include<readline.h>`
`25`		`-#endif`
`26`		`-#if defined(HAVE_READLINE_HISTORY_H)`
`27`		`-#include<readline/history.h>`
`28`		`-#elif defined(HAVE_EDITLINE_HISTORY_H)`
`29`		`-#include<editline/history.h>`
`30`		`-#elif defined(HAVE_HISTORY_H)`
	`34`	`+#if defined(HAVE_HISTORY_H)`
`31`	`35`	`#include<history.h>`
`32`	`36`	`#endif`
`33`		`-#endif`
	`37`	`+`
	`38`	`+#endif/* HAVE_READLINE_READLINE_H, etc */`
	`39`	`+#endif/* HAVE_LIBREADLINE */`
`34`	`40`
`35`	`41`	`#include"pqexpbuffer.h"`
`36`	`42`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9b708f1

File tree

1 file changed

1 file changed

`‎src/bin/psql/input.h`

0 commit comments