From: Marc G. Fournier Date: Sat, 25 Jan 1997 21:58:08 +0000 (+0000) Subject: Modifications to handle the situation where readline.h exists, but X-Git-Tag: REL6_1~634 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d049cec4f5628dad8798bc6871721b22a09b3bd2;p=postgresql 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 --- diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index 6095c3a9cd..409705b48c 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 -# include +# ifdef HAVE_HISTORY_H +# include +# endif # else # include -# include +# ifdef HAVE_READLINE_HISTORY_H +# include +# endif # endif #endif