X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimezone.cpp;h=7c837484c705239f06537e2781209b396c1ef4ba;hb=8e77a1c6747dddf585d653c34e9806e976d2c73a;hp=0ec9d2b8e4137300f3139bfb2f5661e7fe3a0764;hpb=90d55c510f5dbd334be3a16017d1cf6ece61cf85;p=libs%2Fcore.git

diff --git a/source/time/timezone.cpp b/source/time/timezone.cpp
index 0ec9d2b..7c83748 100644
--- a/source/time/timezone.cpp
+++ b/source/time/timezone.cpp
@@ -11,8 +11,8 @@ Distributed under the LGPL
 #else
 #include <fcntl.h>
 #endif
+#include <msp/core/systemerror.h>
 #include <msp/strings/format.h>
-#include "../core/except.h"
 #include "timestamp.h"
 #include "timezone.h"
 #include "units.h"
@@ -40,7 +40,7 @@ TimeZone get_local_timezone()
 	TIME_ZONE_INFORMATION tzinfo;
 	DWORD dst = GetTimeZoneInformation(&tzinfo);
 	if(dst==TIME_ZONE_ID_INVALID)
-		throw Msp::SystemError("Failed to get time zone information", GetLastError());
+		throw Msp::system_error("GetTimeZoneInformation");
 
 	int offset = tzinfo.Bias;
 	if(dst==TIME_ZONE_ID_STANDARD)
@@ -51,7 +51,7 @@ TimeZone get_local_timezone()
 	return TimeZone(offset);
 #else
 	int fd = open("/etc/localtime", O_RDONLY);
-	if(fd>=-1)
+	if(fd!=-1)
 	{
 		char hdr[44];
 		int len = read(fd, hdr, sizeof(hdr));