From 48fb5e4873d9b286debbc4d49a66bbbac77f38d3 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso Dias <carlosdias.dev@gmail.com>
Date: Sun, 28 Jun 2020 17:52:41 -0300
Subject: [PATCH 1/2] fix compilation and testing for bazel 3.3

---
 WORKSPACE                                       | 6 ++++--
 examples/cpp_redis_client.cpp                   | 4 ++++
 examples/cpp_redis_future_client.cpp            | 4 ++++
 examples/cpp_redis_high_availability_client.cpp | 4 ++++
 examples/cpp_redis_kill.cpp                     | 4 ++++
 examples/cpp_redis_multi_exec.cpp               | 4 ++++
 examples/cpp_redis_subscriber.cpp               | 4 ++++
 7 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index a4bea9aa..b7549cca 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,6 +1,8 @@
-new_http_archive(
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
     name = "gtest",
-    build_file = "BUILD.gtest",
+    build_file = "@//:BUILD.gtest",
     sha256 = "f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
     strip_prefix = "googletest-release-1.8.0",
     url = "https://github.com/google/googletest/archive/release-1.8.0.zip",
diff --git a/examples/cpp_redis_client.cpp b/examples/cpp_redis_client.cpp
index 93b8e80a..42675925 100644
--- a/examples/cpp_redis_client.cpp
+++ b/examples/cpp_redis_client.cpp
@@ -22,13 +22,17 @@
 #include <string>
 #include <cpp_redis/cpp_redis>
 #include <cpp_redis/misc/macro.hpp>
+#if _WIN32
 #include "winsock_initializer.h"
+#endif
 
 #define ENABLE_SESSION = 1
 
 int
 main(void) {
+#if _WIN32
 	winsock_initializer winsock_init;
+#endif
 	//! Enable logging
 	cpp_redis::active_logger = std::unique_ptr<cpp_redis::logger>(new cpp_redis::logger);
 
diff --git a/examples/cpp_redis_future_client.cpp b/examples/cpp_redis_future_client.cpp
index 3c060282..87828ca8 100644
--- a/examples/cpp_redis_future_client.cpp
+++ b/examples/cpp_redis_future_client.cpp
@@ -23,11 +23,15 @@
 #include <cpp_redis/cpp_redis>
 
 #include <iostream>
+#if _WIN32
 #include "winsock_initializer.h"
+#endif
 
 int
 main(void) {
+#if _WIN32
   winsock_initializer winsock_init;
+#endif
 
   //! Enable logging
   cpp_redis::active_logger = std::unique_ptr<cpp_redis::logger>(new cpp_redis::logger);
diff --git a/examples/cpp_redis_high_availability_client.cpp b/examples/cpp_redis_high_availability_client.cpp
index 3350c0b2..e2ec2add 100644
--- a/examples/cpp_redis_high_availability_client.cpp
+++ b/examples/cpp_redis_high_availability_client.cpp
@@ -23,11 +23,15 @@
 #include <cpp_redis/cpp_redis>
 
 #include <iostream>
+#if _WIN32
 #include "winsock_initializer.h"
+#endif
 
 int
 main(void) {
+#if _WIN32
   winsock_initializer winsock_init;
+#endif
   //! Enable logging
   cpp_redis::active_logger = std::unique_ptr<cpp_redis::logger>(new cpp_redis::logger);
 
diff --git a/examples/cpp_redis_kill.cpp b/examples/cpp_redis_kill.cpp
index c85c271e..c3029058 100644
--- a/examples/cpp_redis_kill.cpp
+++ b/examples/cpp_redis_kill.cpp
@@ -24,11 +24,15 @@
 
 #include <iostream>
 #include <sstream>
+#if _WIN32
 #include "winsock_initializer.h"
+#endif
 
 int
 main(void) {
+#if _WIN32
   winsock_initializer winsock_init;
+#endif
   cpp_redis::client client;
 
   client.connect("127.0.0.1", 6379, [](const std::string& host, std::size_t port, cpp_redis::connect_state status) {
diff --git a/examples/cpp_redis_multi_exec.cpp b/examples/cpp_redis_multi_exec.cpp
index e47fdc17..fc9922e3 100644
--- a/examples/cpp_redis_multi_exec.cpp
+++ b/examples/cpp_redis_multi_exec.cpp
@@ -1,12 +1,16 @@
 // The MIT License (MIT)
 
+#if _WIN32
 #include "winsock_initializer.h"
+#endif
 #include <cpp_redis/cpp_redis>
 #include <string>
 
 int
 main(void) {
+#if _WIN32
   winsock_initializer winsock_init;
+#endif
   cpp_redis::client client;
 
   client.connect("127.0.0.1", 6379,
diff --git a/examples/cpp_redis_subscriber.cpp b/examples/cpp_redis_subscriber.cpp
index 71a41bb1..6c8e0e2c 100644
--- a/examples/cpp_redis_subscriber.cpp
+++ b/examples/cpp_redis_subscriber.cpp
@@ -27,7 +27,9 @@
 #include <iostream>
 #include <mutex>
 #include <signal.h>
+#if _WIN32
 #include "winsock_initializer.h"
+#endif
 
 std::condition_variable should_exit;
 
@@ -38,7 +40,9 @@ sigint_handler(int) {
 
 int
 main(void) {
+#if _WIN32
   winsock_initializer winsock_init;
+#endif
   //! Enable logging
   cpp_redis::active_logger = std::unique_ptr<cpp_redis::logger>(new cpp_redis::logger);
 

From 2fe9fc7746385d00d4949608f8f9cd43f3f8c51f Mon Sep 17 00:00:00 2001
From: Carlos Cardoso Dias <carlosdias.dev@gmail.com>
Date: Sun, 28 Jun 2020 17:59:01 -0300
Subject: [PATCH 2/2] fix .bzl syntax

---
 repositories.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repositories.bzl b/repositories.bzl
index 86cc85ae..3e506f22 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-cpp_redis_repositories:
+def cpp_redis_repositories():
   """Add external dependencies to the workspace."""
   maybe(
     http_archive,