ports/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp
Dima Panov d0427cb8b4 - Update to 0.12.2 release.
It's a bug/l10n-fix release
2010-02-01 16:40:34 +00:00

52 lines
1.4 KiB
C++

--- ./zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig 2010-01-30 04:35:22.000000000 +1000
+++ ./zlibrary/core/src/unix/time/ZLUnixTime.cpp 2010-02-02 01:23:23.000000000 +1000
@@ -17,35 +17,39 @@
* 02110-1301, USA.
*/
-#include <sys/timeb.h>
-#include <time.h>
+#include <sys/time.h>
#include <ZLTime.h>
#include "ZLUnixTime.h"
ZLTime ZLUnixTimeManager::currentTime() const {
- struct timeb timeB;
- ftime(&timeB);
- return ZLTime(timeB.time, timeB.millitm);
+ struct timeval timeB;
+ gettimeofday(&timeB,NULL);
+ return ZLTime(timeB.tv_sec, timeB.tv_usec/1000);
}
short ZLUnixTimeManager::hoursBySeconds(long seconds) const {
- return localtime(&seconds)->tm_hour;
+ time_t st = seconds;
+ return localtime(&st)->tm_hour;
}
short ZLUnixTimeManager::minutesBySeconds(long seconds) const {
- return localtime(&seconds)->tm_min;
+ time_t st = seconds;
+ return localtime(&st)->tm_min;
}
short ZLUnixTimeManager::yearBySeconds(long seconds) const {
- return localtime(&seconds)->tm_year + 1900;
+ time_t st = seconds;
+ return localtime(&st)->tm_year + 1900;
}
short ZLUnixTimeManager::monthBySeconds(long seconds) const {
- return localtime(&seconds)->tm_mon + 1;
+ time_t st = seconds;
+ return localtime(&st)->tm_mon + 1;
}
short ZLUnixTimeManager::dayOfMonthBySeconds(long seconds) const {
- return localtime(&seconds)->tm_mday;
+ time_t st = seconds;
+ return localtime(&st)->tm_mday;
}