summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-09-15 18:58:07 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-09-15 18:58:07 +0000
commitc3fe9c816e333a62d2b8c4f81e0515f9e166f2e0 (patch)
tree521c48fb4efb3ca43b938777e84d0d227697cbe1
parenta222f346646ca4b6622d3795c115a09b0a9c7d28 (diff)
downloadATCD-dre_osh_04.tar.gz
ChangeLogTag:Sat Sep 13 18:33:07 UTC 2003 Don Hinton <dhinton@dresystems.com>dre_osh_04
-rw-r--r--ace/OS.i8
1 files changed, 8 insertions, 0 deletions
diff --git a/ace/OS.i b/ace/OS.i
index a54df91a714..e2ae31787a0 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -8718,6 +8718,7 @@ ACE_OS::tzset (void)
}
// Linux won't compile unless we explicitly use a namespace here.
+#if defined (linux)
namespace ACE_OS {
ACE_INLINE long
timezone (void)
@@ -8725,6 +8726,13 @@ namespace ACE_OS {
return ::ace_timezone ();
}
} /* namespace ACE_OS */
+#else
+ACE_INLINE long
+ACE_OS::timezone (void)
+{
+ return ::ace_timezone ();
+}
+#endif /* linux */
#if !defined (ACE_LACKS_DIFFTIME)
ACE_INLINE double