8000 fix build with librabbitmq 0.6.0 by remicollet · Pull Request #1008 · collectd/collectd · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix build with librabbitmq 0.6.0 #1008

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? 8000 Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Apr 22, 2015
Merged

fix build with librabbitmq 0.6.0 #1008

merged 2 commits into from
Apr 22, 2015

Conversation

remicollet
Copy link
Contributor

See

Just a trivial fix (but perhaps not the best)

@rubenk
Copy link
Contributor
rubenk commented Apr 21, 2015

Looks good to me. This fixes building on Fedora Rawhide.

@mfournier
Copy link

Thanks a lot @remicollet !

This doesn't introduce any regression from what I can tell.

It looks like AMQP_VERSION was added in rabbitmq-c v0.4.0. Current this change is part of an macro which prevents it from getting built when an older version of rabbitmq-c is found. But to be on the safe side (in case the part of the code gets refactored at some point), could you please change this to read:

#if defined(AMQP_VERSION) && AMQP_VERSION >= 0x00060000

Thanks !

@mfournier mfournier added Bug A genuine bug build An issue with the build labels Apr 21, 2015
@remicollet
Copy link
Contributor Author

done

mfournier pushed a commit that referenced this pull request Apr 22, 2015
Merge pull request #1008 from remicollet/issue-librabbitmq-060
244eda2 
fix build with librabbitmq 0.6.0

Also backported to the collectd-5.3 branch as bd60e5 and 7fd4607.
@mfournier mfournier merged commit 244eda2 into collectd:master Apr 22, 2015
@mfournier
Copy link

Thanks a lot @remicollet ! I also cherry-picked your patchset to the collectd-5.3 branch.

@remicollet
Copy link
Contributor Author

@mfournier thanks.

also cherry-picked your patchset to the collectd-5.3 branch.

Not in 5.4 ?

@mfournier
Copy link

@remicollet, yes it will eventually get merged to 5.4 too.

@octo octo added Fix A pull request fixing a bug and removed Bug A genuine bug labels Jan 15, 2024
@collectd-bot collectd-bot added the Bug A genuine bug label Jan 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Bug A genuine bug build An issue with the build Fix A pull request fixing a bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@remicollet @rubenk @mfournier @octo @collectd-bot
0