[master] 70bce6b Only use readline/history.h if no edit/readline/redline.h
Tollef Fog Heen
tfheen at varnish-cache.org
Mon Nov 19 14:05:42 CET 2012
commit 70bce6bfbd1d86d7a43e26a22812670e9bdc4a8f
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date: Mon Nov 19 14:04:55 2012 +0100
Only use readline/history.h if no edit/readline/redline.h
it seems edit/readline/readline.h and readline/history.h are
incompatible on FreeBSD, so only include one. Hopefully this works on
OpenBSD still.
diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 3e47af2..e353d7f 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -38,12 +38,12 @@
# include <edit/readline/readline.h>
# elif HAVE_READLINE_READLINE_H
# include <readline/readline.h>
+# ifdef HAVE_READLINE_HISTORY_H
+# include <readline/history.h>
+# endif
# else
# include <editline/readline.h>
# endif
-# ifdef HAVE_READLINE_HISTORY_H
-# include <readline/history.h>
-# endif
#endif
#include <errno.h>
More information about the varnish-commit
mailing list