]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Fix inclusions of readline/editline header files so that we only attempt to
authorTom Lane <tgl@sss.pgh.pa.us>
Mon, 24 Aug 2009 16:18:36 +0000 (16:18 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Mon, 24 Aug 2009 16:18:36 +0000 (16:18 +0000)
#include the version of history.h that is in the same directory as the
readline.h we are using.  This avoids problems in some scenarios where both
readline and editline are installed.  Report and patch by Zdenek Kotala.

src/bin/psql/input.h

index bddc174b12a010bfd302988285c146aabe2ae87b..7b492e853982739eb0aa767e67f9c7c10e8c1a71 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.23 2005/01/01 05:43:08 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.23.6.1 2009/08/24 16:18:36 tgl Exp $
  */
 #ifndef INPUT_H
 #define INPUT_H
  */
 #ifdef HAVE_LIBREADLINE
 #define USE_READLINE 1
+
 #if defined(HAVE_READLINE_READLINE_H)
 #include <readline/readline.h>
+#if defined(HAVE_READLINE_HISTORY_H)
+#include <readline/history.h>
+#endif
+
 #elif defined(HAVE_EDITLINE_READLINE_H)
 #include <editline/readline.h>
+#if defined(HAVE_EDITLINE_HISTORY_H)
+#include <editline/history.h>
+#endif
+
 #elif defined(HAVE_READLINE_H)
 #include <readline.h>
-#endif
-#if defined(HAVE_READLINE_HISTORY_H)
-#include <readline/history.h>
-#elif defined(HAVE_EDITLINE_HISTORY_H)
-#include <editline/history.h>
-#elif defined(HAVE_HISTORY_H)
+#if defined(HAVE_HISTORY_H)
 #include <history.h>
 #endif
-#endif
+
+#endif /* HAVE_READLINE_READLINE_H, etc */
+#endif /* HAVE_LIBREADLINE */
 
 
 char      *gets_interactive(const char *prompt);