From 61dbcc2b848b8b0018c9cbd0190f5ca612448647 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Mon, 28 Sep 2020 11:56:49 -0700 Subject: [PATCH] fix docker and linux build --- docker/Dockerfile.alpine | 2 +- ixwebsocket/IXGzipCodec.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index c97e3926..0df5d453 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -2,7 +2,7 @@ FROM alpine:3.12 as build RUN apk add --no-cache \ gcc g++ musl-dev linux-headers \ - cmake mbedtls-dev make zlib-dev python3-dev ninja + cmake mbedtls-dev make zlib-dev python3-dev ninja git RUN addgroup -S app && \ adduser -S -G app app && \ diff --git a/ixwebsocket/IXGzipCodec.cpp b/ixwebsocket/IXGzipCodec.cpp index 39651792..b85fbada 100644 --- a/ixwebsocket/IXGzipCodec.cpp +++ b/ixwebsocket/IXGzipCodec.cpp @@ -62,7 +62,7 @@ namespace ix bool gzipDecompress(const std::string& in, std::string& out) { z_stream inflateState; - std::memset(&inflateState, 0, sizeof(inflateState)); + memset(&inflateState, 0, sizeof(inflateState)); inflateState.zalloc = Z_NULL; inflateState.zfree = Z_NULL;