diff options
| author | Oran Agra <oran@redislabs.com> | 2021-02-01 20:11:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 20:11:42 +0200 |
| commit | 2dba1e391d3772a8da182d95bde050ffa9d01e4d (patch) | |
| tree | 3664bcd3ede605643a18668624f41c846b5e43ab /src/util.c | |
| parent | ec2d180739aa3877a45ec54438c68a7659be5159 (diff) | |
| parent | 95338f9cc41fdfd050f122789187db75fda1fe3c (diff) | |
| download | redis-6.2-rc3.tar.gz | |
Merge 6.2 RC36.2-rc3
Diffstat (limited to 'src/util.c')
| -rw-r--r-- | src/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c index eca212e57..3243fa51e 100644 --- a/src/util.c +++ b/src/util.c @@ -749,7 +749,7 @@ sds getAbsolutePath(char *filename) { * Gets the proper timezone in a more portable fashion * i.e timezone variables are linux specific. */ -unsigned long getTimeZone(void) { +long getTimeZone(void) { #if defined(__linux__) || defined(__sun) return timezone; #else @@ -758,7 +758,7 @@ unsigned long getTimeZone(void) { gettimeofday(&tv, &tz); - return tz.tz_minuteswest * 60UL; + return tz.tz_minuteswest * 60L; #endif } |