New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dnsdist: Include editline/readline.h instead of readline.h/history.h #4065

Merged
merged 3 commits into from Jun 30, 2016

Conversation

Projects
None yet
2 participants
@rgacogne
Member

rgacogne commented Jun 29, 2016

All libedit functions are in <editline/readline.h>, at least on Arch, OpenSUSE Leap and Fedora 22, and it looks like including <readline.h> and <history.h> would get non-libedit headers.

dnsdist: Include editline/readline.h instead of readline.h/history.h
All libedit functions are in <editline/readline.h>.
Including <readline.h> and <history.h> would get non-libedit headers.
@rgacogne

This comment has been minimized.

Member

rgacogne commented Jun 29, 2016

This change was introduced to fix the compilation on OpenBSD, so we should probably test on that platform and on OSX before merging.

@Habbie

This comment has been minimized.

Member

Habbie commented Jun 29, 2016

It turns out bffca8b also breaks OSX.

@Habbie

This comment has been minimized.

Member

Habbie commented Jun 29, 2016

And this commit fixes OSX, but to be complete we should remove LIBEDIT_CFLAGS from the OSX configure line in README.

@Habbie

This comment has been minimized.

Member

Habbie commented Jun 29, 2016

Meanwhile 6561313 (dnsdist-lua.cc) broke OpenBSD!

@Habbie

This comment has been minimized.

Member

Habbie commented Jun 29, 2016

I'll continue with OpenBSD tomorrow.

@Habbie

This comment has been minimized.

Member

Habbie commented Jun 30, 2016

I wonder why dnsdist.cc doesn't need this change

@Habbie

This comment has been minimized.

Member

Habbie commented Jun 30, 2016

I have sent a PR to your branch that fixes dnsdist.cc in general and both files for OpenBSD. Also works on OSX with that change.

Merge pull request #1 from Habbie/4065-openbsd
duplicate header change to dnsdist.cc; make openbsd exceptions

@Habbie Habbie referenced this pull request Jun 30, 2016

Merged

add net/if.h dependencies #4075

@rgacogne rgacogne merged commit 3a2e3ee into PowerDNS:master Jun 30, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@rgacogne rgacogne deleted the rgacogne:dnsdist-libedit-history branch Jun 30, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment