diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/cares/ares_build.h | 10 | ||||
| -rw-r--r-- | third_party/gtest.BUILD | 5 | ||||
| m--------- | third_party/thrift | 0 |
3 files changed, 14 insertions, 1 deletions
diff --git a/third_party/cares/ares_build.h b/third_party/cares/ares_build.h index 7d69f1e6ae..d6b3d49f37 100644 --- a/third_party/cares/ares_build.h +++ b/third_party/cares/ares_build.h @@ -251,4 +251,14 @@ typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t; #endif +/* Undefine UNICODE, as c-ares does not use the ANSI version of functions */ +/* explicitly. */ +#ifdef UNICODE +# undef UNICODE +#endif + +#ifdef _UNICODE +# undef _UNICODE +#endif + #endif /* __CARES_BUILD_H */ diff --git a/third_party/gtest.BUILD b/third_party/gtest.BUILD index 52c9ca2ba7..b70f2c51bc 100644 --- a/third_party/gtest.BUILD +++ b/third_party/gtest.BUILD @@ -2,11 +2,14 @@ cc_library( name = "gtest", srcs = [ "googletest/src/gtest-all.cc", + "googlemock/src/gmock-all.cc" ], - hdrs = glob(["googletest/include/**/*.h", "googletest/src/*.cc", "googletest/src/*.h"]), + hdrs = glob(["googletest/include/**/*.h", "googletest/src/*.cc", "googletest/src/*.h", "googlemock/include/**/*.h", "googlemock/src/*.cc", "googlemock/src/*.h"]), includes = [ "googletest", "googletest/include", + "googlemock", + "googlemock/include", ], linkstatic = 1, visibility = [ diff --git a/third_party/thrift b/third_party/thrift deleted file mode 160000 -Subproject bcad91771b7f0bff28a1cac1981d7ef2b9bcef3 |