From 432009acc6d7bb1c1ff2b20fa7ad848a2bee2cb9 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 31 Jan 2013 11:52:18 +0000 Subject: [PATCH] timeshift: fix atomic add problems on i386 --- src/timeshift.c | 2 +- src/timeshift.h | 6 ++---- src/timeshift/timeshift_filemgr.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/timeshift.c b/src/timeshift.c index 2ecc39b4..de3766e9 100644 --- a/src/timeshift.c +++ b/src/timeshift.c @@ -41,7 +41,7 @@ char *timeshift_path; int timeshift_unlimited_period; uint32_t timeshift_max_period; int timeshift_unlimited_size; -size_t timeshift_max_size; +uint64_t timeshift_max_size; /* * Intialise global file manager diff --git a/src/timeshift.h b/src/timeshift.h index 3c6fc0ab..db173625 100644 --- a/src/timeshift.h +++ b/src/timeshift.h @@ -25,10 +25,8 @@ extern char *timeshift_path; extern int timeshift_unlimited_period; extern uint32_t timeshift_max_period; extern int timeshift_unlimited_size; -extern size_t timeshift_max_size; - -extern size_t timeshift_total_size; -extern pthread_mutex_t timeshift_size_lock; +extern uint64_t timeshift_max_size; +extern uint64_t timeshift_total_size; typedef struct timeshift_status { diff --git a/src/timeshift/timeshift_filemgr.c b/src/timeshift/timeshift_filemgr.c index 64f724bc..185d80a5 100644 --- a/src/timeshift/timeshift_filemgr.c +++ b/src/timeshift/timeshift_filemgr.c @@ -39,7 +39,7 @@ static pthread_t timeshift_reaper_thread; static pthread_mutex_t timeshift_reaper_lock; static pthread_cond_t timeshift_reaper_cond; -size_t timeshift_total_size; +uint64_t timeshift_total_size; /* ************************************************************************** * File reaper thread