From c7ae9b6f8797d7187eec66dc83d1f7272b71fd2a Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Thu, 22 Oct 2020 13:17:21 +0200
Subject: [PATCH 1/2] Windows: update to hiredis 1.0.0

---
 src/Makevars.win   | 4 ++--
 src/registration.c | 3 +++
 tools/winlibs.R    | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Makevars.win b/src/Makevars.win
index 7de62f4..216b29c 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,6 +1,6 @@
 # -*- makefile -*-
-PKG_CPPFLAGS=-I../windows/hiredis-0.9.2/include/hiredis -DSTRICT_R_HEADERS
-PKG_LIBS=-L../windows/hiredis-0.9.2/lib${R_ARCH} -lhiredis -lws2_32
+PKG_CPPFLAGS=-I../windows/hiredis-1.0.0/include/hiredis -DSTRICT_R_HEADERS
+PKG_LIBS=-L../windows/hiredis-1.0.0/lib${R_ARCH} -lhiredis -lws2_32
 
 all: clean winlibs
 
diff --git a/src/registration.c b/src/registration.c
index 651b1d3..01da3e0 100644
--- a/src/registration.c
+++ b/src/registration.c
@@ -1,3 +1,6 @@
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
 #include "connection.h"
 #include "conversions.h"
 #include "subscribe.h"
diff --git a/tools/winlibs.R b/tools/winlibs.R
index 5f9997c..3f1b5b9 100644
--- a/tools/winlibs.R
+++ b/tools/winlibs.R
@@ -1,6 +1,6 @@
-if (!file.exists("../windows/hiredis-0.9.2/include/hiredis/hiredis.h")) {
+if (!file.exists("../windows/hiredis-1.0.0/include/hiredis/hiredis.h")) {
   if (getRversion() < "3.3.0") setInternet2()
-  download.file("https://github.com/rwinlib/hiredis/archive/v0.9.2.zip", "lib.zip", quiet = TRUE)
+  download.file("https://github.com/rwinlib/hiredis/archive/v1.0.0.zip", "lib.zip", quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)
   unzip("lib.zip", exdir = "../windows")
   unlink("lib.zip")

From 220ff83d91ae2088ffda86c4203ec7ac6b39a866 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Thu, 22 Oct 2020 13:34:28 +0200
Subject: [PATCH 2/2] Try to fix AppVeyor

---
 appveyor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 554b93e..7f837dd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,9 +12,7 @@ install:
 
 # Adapt as necessary starting from here
 before_build:
-  - choco install redis-64
-  - redis-server --service-install
-  - redis-server --service-start
+  - choco install memurai-developer
 
 build_script:
   - travis-tool.sh install_deps