trunk: backport eventing from 1.4.3

This commit is contained in:
Marian Krivos
2012-02-05 12:16:58 +00:00
parent 59fe68edbe
commit 7d7c02c579
412 changed files with 3564 additions and 3634 deletions

View File

@@ -1,7 +1,7 @@
//
// Timezone_UNIX.cpp
//
// $Id: //poco/1.4/Foundation/src/Timezone_UNIX.cpp#1 $
// $Id: //poco/1.4/Foundation/src/Timezone_UNIX.cpp#2 $
//
// Library: Foundation
// Package: DateTime
@@ -49,13 +49,13 @@ public:
{
tzset();
}
int timeZone()
{
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(POCO_ANDROID) // no timezone global var
std::time_t now = std::time(NULL);
struct std::tm t;
gmtime_r(&now, &t);
int timeZone()
{
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(POCO_ANDROID) // no timezone global var
std::time_t now = std::time(NULL);
struct std::tm t;
gmtime_r(&now, &t);
std::time_t utc = std::mktime(&t);
return now - utc;
#elif defined(__CYGWIN__)