From: kremlin <ian@kremlin.cc>
Date: Thu, 14 Jul 2016 20:34:34 +0000 (-0500)
Subject: remove references to deprecated tzfile.h, use previously defined consts
X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=commitdiff_plain;h=7a7c9176a59e4286f0c4dc6ead65f1ff9b0b131f

remove references to deprecated tzfile.h, use previously defined consts
---

diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c
index c4f5033..cea5b1a 100644
--- a/src/interfaces/timedated/timedated.c
+++ b/src/interfaces/timedated/timedated.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <time.h>
 #include <string.h>
-#include <tzfile.h>
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
@@ -215,7 +214,7 @@ on_handle_set_timezone(Timedate1 *td1_passed_interf,
     g_ptr_array_add(timedated_freeable, statbuf);
     g_ptr_array_add(timedated_freeable, tz_target_path);
 
-    strlcat(tz_target_path, TZDIR, TZNAME_MAX);
+    strlcat(tz_target_path, OS_TIMEZONE_PATH, TZNAME_MAX);
     strlcat(tz_target_path, "/", TZNAME_MAX);
     strlcat(tz_target_path, proposed_tz, TZNAME_MAX);
 
@@ -252,11 +251,11 @@ on_handle_set_timezone(Timedate1 *td1_passed_interf,
 
     memset(statbuf, 0, sizeof statbuf);
 
-    if(!lstat(TZDEFAULT, statbuf))
-        if(remove(TZDEFAULT))
+    if(!lstat(OS_LOCALTIME, statbuf))
+        if(remove(OS_LOCALTIME))
             return FALSE;
 
-    if(symlink(tz_target_path, TZDEFAULT))
+    if(symlink(tz_target_path, OS_LOCALTIME))
         return FALSE;