Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Readline detection #1956

Merged
merged 2 commits into from May 17, 2024
Merged

Readline detection #1956

merged 2 commits into from May 17, 2024
+4 −2

Conversation

oliv3r
Copy link

@oliv3r oliv3r commented May 10, 2024 •
edited

Readline detection/guarding has two small bugs. This merge request tries to fix them. No actual code was changed. This prevents compile errors when no readline was detected but readline.h is included.

By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.
  • I have read the above and my PR is ready for review. Check this box to confirm

@oliv3r
FTL_lua: Properly guard readline
7de24a0 
Readline support should only be used when we know it is available. Lets
properly use a ifdef guard like we do in `shell.c`.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
@oliv3r
FTL: Avoid hidden HAVE_READLINE define
be3d4cd 
We should set `HAVE_READLINE` based on whether it was actually
detected/found, not via a hidden fixed, as that contains compile errors
when readline is actually not available.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
@oliv3r oliv3r changed the base branch from master to development-v6 May 10, 2024 17:20
@DL6ER DL6ER merged commit 4628219 into pi-hole:development-v6 May 17, 2024
1 check passed
@DL6ER DL6ER mentioned this pull request May 18, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DL6ER DL6ER DL6ER approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@oliv3r @DL6ER