summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc G. Fournier1997-01-25 21:58:08 +0000
committerMarc G. Fournier1997-01-25 21:58:08 +0000
commitd049cec4f5628dad8798bc6871721b22a09b3bd2 (patch)
tree47ba9665e5f8b6a8a9070d7f81f18f67ea074bbe /src
parent49f30e80fccfff1fc2df3854e01de448ce5a309f (diff)
Modifications to handle the situation where readline.h exists, but
history.h doesn't...previously, it was assumed that both existed, or didn't exist...but this assumption fails on the one sparc_solaris box that I have access to, and could exist in other circumstances
Diffstat (limited to 'src')
-rw-r--r--src/bin/psql/psql.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 6095c3a9cd0..409705b48c7 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.50 1997/01/25 03:51:59 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.51 1997/01/25 21:58:08 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,10 +35,14 @@
#else
# ifdef HAVE_READLINE_H
# include <readline.h>
-# include <history.h>
+# ifdef HAVE_HISTORY_H
+# include <history.h>
+# endif
# else
# include <readline/readline.h>
-# include <readline/history.h>
+# ifdef HAVE_READLINE_HISTORY_H
+# include <readline/history.h>
+# endif
# endif
#endif