|
Link Here
|
|
|
1 |
--- src/BUILD.orig 2017-07-31 10:06:21.426927000 +0200 |
| 2 |
+++ src/BUILD 2017-07-31 10:06:44.279345000 +0200 |
| 3 |
@@ -179,7 +179,7 @@ |
| 4 |
"//src/java_tools/singlejar:SingleJar_deploy.jar", |
| 5 |
], |
| 6 |
"//conditions:default": [ |
| 7 |
- "//src/tools/singlejar:singlejar", |
| 8 |
+ "//src/java_tools/singlejar:SingleJar_deploy.jar", |
| 9 |
], |
| 10 |
}) + select({ |
| 11 |
"//tools/jdk:jdk7": [], |
| 12 |
--- src/main/cpp/blaze_util_posix.cc.orig |
| 13 |
+++ src/main/cpp/blaze_util_posix.cc |
| 14 |
@@ -29,6 +29,7 @@ |
| 15 |
#include <sys/resource.h> |
| 16 |
#include <sys/wait.h> |
| 17 |
#include <unistd.h> |
| 18 |
+#include <time.h> |
| 19 |
|
| 20 |
#include <cassert> |
| 21 |
#include <cinttypes> |
| 22 |
@@ -648,8 +649,8 @@ |
| 23 |
} |
| 24 |
|
| 25 |
void TrySleep(unsigned int milliseconds) { |
| 26 |
- unsigned int seconds_part = milliseconds / 1000; |
| 27 |
- unsigned int nanoseconds_part = (milliseconds % 1000) * 1000 * 1000; |
| 28 |
+ time_t seconds_part = (time_t) (milliseconds / 1000); |
| 29 |
+ long nanoseconds_part = ((long)(milliseconds % 1000)) * 1000 * 1000; |
| 30 |
struct timespec sleeptime = {seconds_part, nanoseconds_part}; |
| 31 |
nanosleep(&sleeptime, NULL); |
| 32 |
} |