I attached conservative version of patch which only reorder #define to
avoid cross including half from readline and half from editline.
Zdenek
Tom Lane píše v čt 06. 08. 2009 v 18:13 -0400:
> Zdenek Kotala <zdenek.kot...@sun.com> writes:
> > It seems to me that editline never distributed history.h file and
> > HAVE_EDITLINE_HISTORY_H is nonsense. But I'm not sure.
>
> I wouldn't count on that, in part because there are so many versions of
> editline. On an OS X machine I see
>
> $ ls -l /usr/include/*line*
> /usr/include/editline:
> total 16
> -rw-r--r-- 1 root wheel 6882 Feb 19 2008 readline.h
>
> /usr/include/readline:
> total 16
> lrwxr-xr-x 1 root wheel 22 Jul 23 11:31 history.h@ ->
> ../editline/readline.h
> lrwxr-xr-x 1 root wheel 22 Jul 23 11:31 readline.h@ ->
> ../editline/readline.h
>
> regards, tom lane
diff -r dd477d7938da src/bin/psql/input.h
--- a/src/bin/psql/input.h Wed Jun 03 00:38:34 2009 +0000
+++ b/src/bin/psql/input.h Wed Aug 12 21:49:49 2009 +0200
@@ -18,17 +18,19 @@
#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>
+#if defined(HAVE_HISTORY_H)
+#include <history.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)
-#include <history.h>
#endif
#endif
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
