--- cpp/log/frontend_test.cc.orig 2016-10-14 17:11:57 UTC +++ cpp/log/frontend_test.cc @@ -1,5 +1,8 @@ /* -*- indent-tabs-mode: nil -*- */ #include +// Without this, build will fail due to clash between onigposix.h +// and regex.h; note it's only compiled with "make check". +#define GTEST_HAS_POSIX_RE 0 #include #include #include