summaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
authorYossi Gottlieb <yossigo@gmail.com>2020-12-13 17:09:54 +0200
committerGitHub <noreply@github.com>2020-12-13 17:09:54 +0200
commit86e3395c117d9450d52ee3ebbc62c386d11f1b79 (patch)
treef01054125b9bf5db15095382a318c8f7d45804d6 /src/util.c
parentf74c32cad27fcd078f7bb8517c87be178e7339eb (diff)
downloadredis-86e3395c117d9450d52ee3ebbc62c386d11f1b79.tar.gz
Several (mostly Solaris-related) cleanups (#8171)
* Allow runtest-moduleapi use a different 'make', for systems where GNU Make is 'gmake'. * Fix issue with builds on Solaris re-building everything from scratch due to CFLAGS/LDFLAGS not stored. * Fix compile failure on Solaris due to atomicvar and a bunch of warnings. * Fix garbled log timestamps on Solaris.
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c
index 0d48f5701..eca212e57 100644
--- a/src/util.c
+++ b/src/util.c
@@ -749,9 +749,8 @@ sds getAbsolutePath(char *filename) {
* Gets the proper timezone in a more portable fashion
* i.e timezone variables are linux specific.
*/
-
unsigned long getTimeZone(void) {
-#ifdef __linux__
+#if defined(__linux__) || defined(__sun)
return timezone;
#else
struct timeval tv;