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

diff --git a/source/time/timezone.cpp b/source/time/timezone.cpp
index 0ec9d2b..a755954 100644
--- a/source/time/timezone.cpp
+++ b/source/time/timezone.cpp
@@ -1,18 +1,12 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2008-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cstdlib>
 #ifdef WIN32
 #include <windows.h>
 #else
+#include <unistd.h>
 #include <fcntl.h>
 #endif
 #include <msp/strings/format.h>
-#include "../core/except.h"
+#include <msp/core/systemerror.h>
 #include "timestamp.h"
 #include "timezone.h"
 #include "units.h"
@@ -40,7 +34,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 +45,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));