Skip to content

flb_utils.c: fix for macOS < 12#9217

Merged
edsiper merged 1 commit intofluent:masterfrom
barracuda156:flb_utils
Aug 27, 2024
Merged

flb_utils.c: fix for macOS < 12#9217
edsiper merged 1 commit intofluent:masterfrom
barracuda156:flb_utils

Conversation

@barracuda156
Copy link
Contributor

kIOMainPortDefault is available on macOS 12+: https://developer.apple.com/documentation/iokit/kiomainportdefault
Add a fallback definition to fix compilation on earlier systems.

Verified to work on macOS 10.6.


Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

Signed-off-by: Sergey Fedorov <barracuda@macos-powerpc.org>
Copy link
Contributor

@cosmo0920 cosmo0920 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is one of the candidates to fix compilation issue that is caused by an absence of kIOMainPortDefault on macOS 11.0 or earlier.

@edsiper
Copy link
Member

edsiper commented Aug 27, 2024

thanks for the contribution. for commits just need to fix the prefix (I will do it for now)

flb_utils.c: fix for macOS < 12

  • use prefix utils: ...
  • be more descriptive on what's the fix

@edsiper edsiper merged commit e8b5eee into fluent:master Aug 27, 2024
edsiper pushed a commit that referenced this pull request Aug 27, 2024
Signed-off-by: Sergey Fedorov <barracuda@macos-powerpc.org>
@barracuda156 barracuda156 deleted the flb_utils branch August 27, 2024 16:18
@barracuda156
Copy link
Contributor Author

thanks for the contribution. for commits just need to fix the prefix (I will do it for now)

flb_utils.c: fix for macOS < 12

  • use prefix utils: ...

  • be more descriptive on what's the fix

@edsiper Noted. Thank you!

legendary-acp pushed a commit to ctrlb-hq/ctrlb-fluent-bit that referenced this pull request Oct 1, 2024
Signed-off-by: Sergey Fedorov <barracuda@macos-powerpc.org>
scne59 pushed a commit to scne59/fluent-bit that referenced this pull request Apr 9, 2025
Signed-off-by: Sergey Fedorov <barracuda@macos-powerpc.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants