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

Linux: Frameserver system memory access #61

Merged
merged 2 commits into from
Apr 15, 2016
Merged

Linux: Frameserver system memory access #61

merged 2 commits into from
Apr 15, 2016

Conversation

ideasman42
Copy link
Collaborator

Fix for building tfarmserver.cpp on linux

@ideasman42 ideasman42 changed the title Linux: frameserver memory fix Linux: Frameserver system memory access Mar 27, 2016
@@ -49,6 +49,10 @@ using namespace std;
#include <sys/sysctl.h> //To retrieve MAC HW infos
#endif

#ifdef LINUX
#include <sys/sysctl.h> //For getting total memory

Choose a reason for hiding this comment

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

According to sysconf(3), and on my glibc/linux system, sysconf is defined in unistd.h and not sys/sysctl.h.

@@ -49,6 +49,10 @@ using namespace std;
#include <sys/sysctl.h> //To retrieve MAC HW infos
#endif

#ifdef LINUX
#include <sys/sysctl.h>

Choose a reason for hiding this comment

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

As I already told you earlier, sysconf and the two constants you use are declared in unistd.h (which is already included), not sys/sysctl.h.

@skitaoka skitaoka merged commit a09dc1b into opentoonz:master Apr 15, 2016
@skitaoka
Copy link
Member

merged, thanks

@ideasman42 ideasman42 deleted the linux-frameserver-sysconf-fix branch April 17, 2016 05:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants