summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-05 17:19:45 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-05 17:19:45 +0000
commitbad8c2b8ec3d79f8345dd49bc36a8cf3f49ea5a8 (patch)
tree509c912bf7bb405daae4cd2ed0824b551339d20a
parentd3cf6c9c1e98e8b804d5bdc1792967e257a4ac60 (diff)
downloadATCD-bad8c2b8ec3d79f8345dd49bc36a8cf3f49ea5a8.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-99b3
-rw-r--r--ace/OS.i2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index ca61367fab1..de355367f2d 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,7 +1,8 @@
-Mon Jul 05 11:30:19 1999 Nanbor Wang <nanbor@cs.wustl.edu>
+Mon Jul 05 12:14:56 1999 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/OS.i: Wchat_t version of strenvdup should only be available
on Win32. Thanks to Bala, Carlos, and David for noticing this.
+ (strspn): Ditto to this function.
Mon Jul 05 09:58:07 1999 David L. Levine <levine@cs.wustl.edu>
diff --git a/ace/OS.i b/ace/OS.i
index 2df10f3759c..0d95b29f21b 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -10391,7 +10391,7 @@ ACE_OS::strcpy (wchar_t *s, const wchar_t *t)
ACE_INLINE size_t
ACE_OS::strspn (const wchar_t *s, const wchar_t *t)
{
-#if !defined (ACE_HAS_WINCE)
+#if !defined (ACE_HAS_WINCE) && defined (ACE_HAS_UNICODE)
ACE_TRACE ("ACE_OS::strspn");
return ::wcsspn (s, t);
#else