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.

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

Remove erroneous include statement for FreeBSD #1402

Merged
merged 1 commit into from Mar 5, 2015

Conversation

clemensg
Copy link
Contributor

@clemensg clemensg commented Mar 4, 2015

I don't think we should include sys/pcpu.h here. It leads to the build error described in #1401

This PR should fix it. On my FreeBSD 10.1 box, the build error did not occur anymore!

Signed-off-by: Clemens Gruber clemensgru@gmail.com

Signed-off-by: Clemens Gruber <clemensgru@gmail.com>
@FooBarWidget
Copy link
Member

Thanks for this pull request. Are you sure pcpu.h is not needed? I included it because it was present in vmstat.c. Have you also tested this on older FreeBSD versions?

@clemensg
Copy link
Contributor Author

clemensg commented Mar 5, 2015

Hi, as far as I understand, the sys/pcpu.h include in vmstat.c is due to the use of pcpu structs in the function fill_pcpu, etc. But you don't use pcpu structs in SystemMetricsCollector.h.
The only occurence of the term pcpu in that file is the include statement, so I don't think it would break anything.
But it is broken now, as reported in #1401 ;-)

OnixGH added a commit that referenced this pull request Mar 5, 2015
Remove unused include statement for FreeBSD that confuses the build
@OnixGH OnixGH merged commit 9313a7d into phusion:master Mar 5, 2015
@FooBarWidget
Copy link
Member

@OnixGH Could you update the changelog too?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants