diff options
| author | Wolfgang Hommel <wolfcw@users.noreply.github.com> | 2019-11-14 19:33:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 19:33:00 +0100 |
| commit | a0fe6b56b0ec64750866b47e5064501e42cf5008 (patch) | |
| tree | c1b1d42868e2d1d07aab57e400e32e9e4de2ef1b | |
| parent | 826f8b779242cf66b3f6537c1549c2a6b9cd40e4 (diff) | |
| parent | fdc3c81ae07918acff9c9f0a4c811d6056dac258 (diff) | |
| download | libfaketime-a0fe6b56b0ec64750866b47e5064501e42cf5008.tar.gz | |
Merge pull request #215 from wolfcw/develop
Merge changes from develop branch
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/libfaketime.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 61706e8..a31c025 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ matrix: include: - os: linux compiler: gcc + - os: osx + osx_image: xcode11 script: - cd ${TRAVIS_BUILD_DIR} diff --git a/src/libfaketime.c b/src/libfaketime.c index 257b9f7..4614e28 100644 --- a/src/libfaketime.c +++ b/src/libfaketime.c @@ -286,8 +286,6 @@ static double user_rate = 1.0; static bool user_rate_set = false; static struct timespec user_per_tick_inc = {0, -1}; static bool user_per_tick_inc_set = false; -static bool user_per_tick_inc_set_backup = false; - enum ft_mode_t {FT_FREEZE, FT_START_AT, FT_NOOP} ft_mode = FT_FREEZE; /* Time to fake is not provided through FAKETIME env. var. */ @@ -681,6 +679,7 @@ static bool load_time(struct timespec *tp) #include <sys/stat.h> static int fake_stat_disabled = 0; +static bool user_per_tick_inc_set_backup = false; void lock_for_stat() { |