compiling fix under Ubuntu14.04 #476

baidu · Nov 30, 2016 · 7cc2dcb · 7cc2dcb
1 parent 69bba14
commit 7cc2dcb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/SConstruct b/SConstruct
@@ -10,7 +10,7 @@ env_gen.Protoc(['src/protocol/appworker.pb.h','src/protocol/appworker.pb.cc'], '
 
 env = Environment(
         CPPPATH = ['.', 'src', 'src/agent', 'thirdparty/boost_1_57_0/', './thirdparty/include', './thirdparty/rapidjson/include', 'src/utils'] ,
-        LIBS = ['ins_sdk', 'sofa-pbrpc', 'protobuf', 'snappy', 'glog', 'gflags', 'tcmalloc', 'unwind', 'pthread', 'z', 'rt', 'boost_filesystem', 'gtest', 'common', 'leveldb'],
+        LIBS = ['ins_sdk', 'sofa-pbrpc', 'protobuf', 'glog', 'gflags', 'tcmalloc', 'unwind', 'pthread', 'z', 'rt', 'boost_filesystem', 'gtest', 'common', 'leveldb', 'snappy'],
         LIBPATH = ['./thirdparty/lib', './thirdparty/boost_1_57_0/stage/lib'],
         CCFLAGS = '-g2 -Wall -Werror -Wno-unused-but-set-variable',
         LINKFLAGS = '-Wl,-rpath-link ./thirdparty/boost_1_57_0/stage/lib')

diff --git a/build.sh b/build.sh
diff --git a/src/client/galaxy_util.cc b/src/client/galaxy_util.cc
@@ -3,12 +3,13 @@
 // found in the LICENSE file.
 
 #include <stdint.h>
-#include <cstring>
 #include <stdio.h>
-#include <string>
+#include <unistd.h>
+#include <cstring>
+#include <fstream>
 #include <map>
+#include <string>
 #include <vector>
-#include <fstream>
 #include "string_util.h"
 #include "galaxy_util.h"
 #include "rapidjson/prettywriter.h"