You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.1 KiB
56 lines
2.1 KiB
Index: src/Makefile.in |
|
--- src/Makefile.in.orig 2016-07-23 07:24:12.000000000 +0200 |
|
+++ src/Makefile.in 2016-07-27 20:49:02.932128878 +0200 |
|
@@ -1988,7 +1988,7 @@ |
|
# of libmesos will still take a hard dependency on SASL, while Windows builds |
|
# won't. Currently, the dependency is still assumed throughout the tests, |
|
# though the plan is to remove this hard dependency as well. See MESOS-5450. |
|
-MESOS_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror -DLIBDIR=\"$(libdir)\" \ |
|
+MESOS_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR=\"$(libdir)\" \ |
|
-DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ |
|
-DPKGDATADIR=\"$(pkgdatadir)\" \ |
|
-DPKGMODULEDIR=\"$(pkgmoduledir)\" -I$(top_srcdir)/include \ |
|
@@ -2744,7 +2744,7 @@ |
|
# Add the convenience library. |
|
libmesos_la_LIBADD = libmesos_no_3rdparty.la $(LIB_GLOG) \ |
|
$(LIB_LEVELDB) $(LIB_PROCESS) $(LIB_PROTOBUF) $(LIB_ZOOKEEPER) \ |
|
- -lsvn_subr-1 -lsvn_delta-1 -lapr-1 $(am__append_23) |
|
+ -lsvn_subr-1 -lsvn_delta-1 -lapr $(am__append_23) |
|
mesos_agent_SOURCES = slave/main.cpp |
|
mesos_agent_CPPFLAGS = $(MESOS_CPPFLAGS) |
|
mesos_agent_LDADD = libmesos.la $(LDADD) |
|
Index: src/common/values.cpp |
|
--- src/common/values.cpp.orig 2016-07-23 07:23:58.000000000 +0200 |
|
+++ src/common/values.cpp 2016-07-27 20:49:02.932128878 +0200 |
|
@@ -52,7 +52,7 @@ |
|
|
|
static long long convertToFixed(double floatValue) |
|
{ |
|
- return std::llround(floatValue * 1000); |
|
+ return llround(floatValue * 1000); |
|
} |
|
|
|
|
|
Index: src/slave/containerizer/mesos/provisioner/provisioner.cpp |
|
--- src/slave/containerizer/mesos/provisioner/provisioner.cpp.orig 2016-07-23 07:23:58.000000000 +0200 |
|
+++ src/slave/containerizer/mesos/provisioner/provisioner.cpp 2016-07-27 23:32:18.574793448 +0200 |
|
@@ -15,6 +15,7 @@ |
|
// limitations under the License. |
|
|
|
#ifndef __WINDOWS__ |
|
+#include <sys/types.h> |
|
#include <fts.h> |
|
#endif // __WINDOWS__ |
|
|
|
Index: src/v1/values.cpp |
|
--- src/v1/values.cpp.orig 2016-07-23 07:23:58.000000000 +0200 |
|
+++ src/v1/values.cpp 2016-07-27 20:49:02.942087755 +0200 |
|
@@ -53,7 +53,7 @@ |
|
|
|
static long long convertToFixed(double floatValue) |
|
{ |
|
- return std::llround(floatValue * 1000); |
|
+ return llround(floatValue * 1000); |
|
} |
|
|
|
|
|
|