svn commit: r1131903 - in /incubator/mesos/trunk/src: configurator.cpp test_framework.cpp

[be...@apache.org]

Author: benh
Date: Sun Jun  5 05:47:03 2011
New Revision: 1131903

URL: http://svn.apache.org/viewvc?rev=1131903&view=rev
Log:
Fix build on Linux

Modified:
    incubator/mesos/trunk/src/configurator.cpp
    incubator/mesos/trunk/src/test_framework.cpp

Modified: incubator/mesos/trunk/src/configurator.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/configurator.cpp?rev=1131903&r1=1131902&r2=1131903&view=diff
==============================================================================
--- incubator/mesos/trunk/src/configurator.cpp (original)
+++ incubator/mesos/trunk/src/configurator.cpp Sun Jun  5 05:47:03 2011
@@ -23,15 +23,17 @@ const char* Configurator::ENV_VAR_PREFIX
 // On Mac OS X, the environ symbol isn't visible to shared libraries,
 // so we must use the _NSGetEnviron() function (see man environ on OS X).
 // On other platforms, it's fine to access environ from shared libraries.
-namespace {
 #ifdef __APPLE__
-  #include "crt_externs.h"
-  char** getEnviron() { return *_NSGetEnviron(); }
+#include "crt_externs.h"
+namespace {
+char** getEnviron() { return *_NSGetEnviron(); }
+}
 #else
-  extern char** environ;
-  char** getEnviron() { return environ; }
-#endif /* __APPLE__ */
+extern char** environ;
+namespace {
+char** getEnviron() { return environ; }
 }
+#endif /* __APPLE__ */
 
 
 void Configurator::validate()

Modified: incubator/mesos/trunk/src/test_framework.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/test_framework.cpp?rev=1131903&r1=1131902&r2=1131903&view=diff
==============================================================================
--- incubator/mesos/trunk/src/test_framework.cpp (original)
+++ incubator/mesos/trunk/src/test_framework.cpp Sun Jun  5 05:47:03 2011
@@ -2,6 +2,7 @@
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <nexus_sched.h>
 
 using namespace std;