*** empty log message ***

2 files changed, 9 insertions, 2 deletions

diff --git a/ace/OS.i b/ace/OS.i
index 6161bd5a782..06e19582147 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -8620,7 +8620,7 @@ ACE_OS::strrchr (wchar_t *s, wint_t c)
 {
   // ACE_TRACE ("ACE_OS::strrchr");
 #if !defined (ACE_HAS_WINCE)
-  return (const wchar_t *) ::wcsrchr (s, c);
+  return (wchar_t *) ::wcsrchr (s, c);
 #else
   wchar_t *p = s + ::wcslen (s);
 
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index b23c917d81c..1acb1ce6e57 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -1,5 +1,5 @@
 // $Id$
-
+#define ACE_BUILD_DLL
 #include "ace/Stats.h"
 
 #if !defined (__ACE_INLINE__)
@@ -12,7 +12,14 @@
 //    on the stack, and construct it in, each function that needs it.
 // 2) To avoid warnings from some compilers, split the 0x100000000ull
 //    constant into two pieces.
+
+// @@ David, do we need an ACE_UINT64_LITERAL(X) macro here?
+
+# if defined (ACE_WIN32)
+static const ACE_UINT64 ACE_STATS_INTERNAL_OFFSET = 0x100000000ui64;
+# else
 static const ACE_UINT64 ACE_STATS_INTERNAL_OFFSET = 0x10000ull * 0x10000ull;
+# endif
 #endif /* ! ACE_LACKS_LONGLONG_T */
 
 ACE_UINT32