summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_time.h
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-03-09 01:07:44 +0000
committerSteve Huston <shuston@riverace.com>2007-03-09 01:07:44 +0000
commita61714cf83a43552d74232bec6bf2965868142de (patch)
tree6553cb506c511a771a9aac20cc6ff91643494aaf /ACE/ace/OS_NS_time.h
parentacc13c6e0ae9f31dd5895864c7fe76bbc2a6f2f6 (diff)
downloadATCD-a61714cf83a43552d74232bec6bf2965868142de.tar.gz
ChangeLogTag:Fri Mar 9 00:53:43 UTC 2007 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/OS_NS_time.h')
-rw-r--r--ACE/ace/OS_NS_time.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index 747fdccbaa5..b29c636d1f8 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -77,17 +77,10 @@ struct tm {
*/
inline long ace_timezone()
{
-#if defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32)
TIME_ZONE_INFORMATION tz;
GetTimeZoneInformation (&tz);
return tz.Bias * 60;
-#elif defined (ACE_WIN32) && !defined (ACE_HAS_DINKUM_STL)
- return _timezone; // For Win32.
-#elif defined (ACE_WIN32) && defined (ACE_HAS_DINKUM_STL)
- time_t tod = time(0); // get current time
- time_t t1 = mktime(gmtime(&tod)); // convert without timezone
- time_t t2 = mktime(localtime(&tod)); // convert with timezone
- return difftime(t1, t2); // compute difference in seconds
#elif defined (ACE_HAS_TIMEZONE)
// The XPG/POSIX specification requires that tzset() be called to
// set the global variable <timezone>.