octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-22 16:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/macosx' into macosx

Browse Source
This commit is contained in:
Takeshi Nakatani 2017-08-11 14:20:12 +00:00
commit 96d8e6d823
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -27,7 +27,7 @@ Installation
On Ubuntu 14.04: 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: On CentOS 7:

2
src/cache.cpp
View File

@ -59,7 +59,7 @@ using namespace std;
#ifdef HAVE_CLOCK_GETTIME #ifdef HAVE_CLOCK_GETTIME
static int s3fs_clock_gettime(int clk_id, struct timespec* ts) static int s3fs_clock_gettime(int clk_id, struct timespec* ts)
{ {
return clock_gettime(clk_id, ts); return clock_gettime(static_cast<clockid_t>(clk_id), ts);
} }
#else #else
static int s3fs_clock_gettime(int clk_id, struct timespec* ts) static int s3fs_clock_gettime(int clk_id, struct timespec* ts)

2
test/integration-test-common.sh
View File

@ -50,7 +50,7 @@ export S3_URL
export TEST_SCRIPT_DIR=`pwd` export TEST_SCRIPT_DIR=`pwd`
export TEST_BUCKET_MOUNT_POINT_1=${TEST_BUCKET_1} 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}"} S3PROXY_BINARY=${S3PROXY_BINARY-"s3proxy-${S3PROXY_VERSION}"}
if [ ! -f "$S3FS_CREDENTIALS_FILE" ] if [ ! -f "$S3FS_CREDENTIALS_FILE" ]