aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/psql/input.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h
index 73879c88b22..d89f65f7f00 100644
--- a/src/bin/psql/input.h
+++ b/src/bin/psql/input.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2009, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.31 2009/01/01 17:23:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.31.2.1 2009/08/24 16:18:19 tgl Exp $
*/
#ifndef INPUT_H
#define INPUT_H
@@ -16,21 +16,27 @@
*/
#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 */
#include "pqexpbuffer.h"