diff --git a/README.md b/README.md index 061ebe3..823aef5 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Installation On Ubuntu 14.04: ``` -sudo apt-get install automake autotools-dev g++ git libcurl4-gnutls-dev libfuse-dev libssl-dev libxml2-dev make pkg-config +sudo apt-get install automake autotools-dev fuse g++ git libcurl4-gnutls-dev libfuse-dev libssl-dev libxml2-dev make pkg-config ``` On CentOS 7: diff --git a/src/cache.cpp b/src/cache.cpp index 4856d23..e6d3a81 100644 --- a/src/cache.cpp +++ b/src/cache.cpp @@ -59,7 +59,7 @@ using namespace std; #ifdef HAVE_CLOCK_GETTIME static int s3fs_clock_gettime(int clk_id, struct timespec* ts) { - return clock_gettime(clk_id, ts); + return clock_gettime(static_cast(clk_id), ts); } #else static int s3fs_clock_gettime(int clk_id, struct timespec* ts) diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index f551138..3b49648 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -50,7 +50,7 @@ export S3_URL export TEST_SCRIPT_DIR=`pwd` export TEST_BUCKET_MOUNT_POINT_1=${TEST_BUCKET_1} -S3PROXY_VERSION="1.5.2" +S3PROXY_VERSION="1.5.3" S3PROXY_BINARY=${S3PROXY_BINARY-"s3proxy-${S3PROXY_VERSION}"} if [ ! -f "$S3FS_CREDENTIALS_FILE" ]