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 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 +#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")