diff options
author | Phillipp Schoppmann <schoppmp+git@posteo.net> | 2020-12-02 10:16:17 +0100 |
---|---|---|
committer | Phillipp Schoppmann <schoppmp+git@posteo.net> | 2020-12-02 10:16:17 +0100 |
commit | ee2c581454fd895d9928fe27b7ba0d0ebfd8fda2 (patch) | |
tree | a4d057231966212cc038ab5efe63c5d3b3d145bd | |
parent | 99fbcf79c5aded3694973086651f535d08a645c5 (diff) | |
download | private-join-and-compute-ee2c581454fd895d9928fe27b7ba0d0ebfd8fda2.tar.gz |
Fix build on Windows
-rw-r--r-- | WORKSPACE | 6 | ||||
-rw-r--r-- | client.cc | 2 | ||||
-rw-r--r-- | crypto/openssl_init.cc | 1 | ||||
-rw-r--r-- | generate_dummy_data.cc | 1 | ||||
-rw-r--r-- | server.cc | 3 |
5 files changed, 10 insertions, 3 deletions
@@ -33,9 +33,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "com_github_glog_glog", - sha256 = "f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c", - strip_prefix = "glog-0.4.0", - urls = ["https://github.com/google/glog/archive/v0.4.0.tar.gz"], + sha256 = "cbba86b5a63063999e0fc86de620a3ad22d6fd2aa5948bff4995dcd851074a0b", + strip_prefix = "glog-c8f8135a5720aee7de8328b42e4c43f8aa2e60aa", + urls = ["https://github.com/google/glog/archive/c8f8135a5720aee7de8328b42e4c43f8aa2e60aa.zip"], ) # gflags @@ -17,6 +17,8 @@ #include <memory> #include <string> +#define GLOG_NO_ABBREVIATED_SEVERITIES +#include "glog/logging.h" #include "gflags/gflags.h" #include "include/grpc/grpc_security_constants.h" diff --git a/crypto/openssl_init.cc b/crypto/openssl_init.cc index e06a2a8..67f4836 100644 --- a/crypto/openssl_init.cc +++ b/crypto/openssl_init.cc @@ -14,6 +14,7 @@ */ #include "crypto/openssl_init.h" +#include "openssl/base.h" // For OPENSSL_IS_BORINGSSL. #if !defined(OPENSSL_IS_BORINGSSL) #include <pthread.h> diff --git a/generate_dummy_data.cc b/generate_dummy_data.cc index 7ee061f..7902c02 100644 --- a/generate_dummy_data.cc +++ b/generate_dummy_data.cc @@ -18,6 +18,7 @@ #include "gflags/gflags.h" +#define GLOG_NO_ABBREVIATED_SEVERITIES #include "glog/logging.h" #include "data_util.h" @@ -18,6 +18,9 @@ #include <string> #include <thread> // NOLINT + +#define GLOG_NO_ABBREVIATED_SEVERITIES +#include "glog/logging.h" #include "gflags/gflags.h" #include "include/grpc/grpc_security_constants.h" |