*** empty log message ***

2 files changed, 21 insertions, 15 deletions

diff --git a/ChangeLog-97b b/ChangeLog-97b
index 724d885221a..778b4b4b0c1 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,11 @@
+Wed Oct 29 20:30:55 1997  James C Hu  <jxh@lambada.cs.wustl.edu>
+
+	* ace/OS.i (strlen): Moved it earlier so that it would be declared
+	  inline before use.
+
+	* ace/OS.i (strcasecmp): Removed spurious semi-colons (how did
+	  they get in there?).
+
 Wed Oct 29 19:30:07 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
 	* ace/OS.h: #include <unistd.h> before ACE_Time_Value as long as
@@ -151,13 +159,13 @@ Wed Oct 29 00:29:52 1997    <irfan@TWOSTEP>
           necessary since this class has been absorbed into ACE.
 
         * tests: Fixed auto_ptr use in:
-          
+
           Notify_Performance_Test.cpp
-          Priority_Reactor_Test.cpp 
-          Reactor_Performance_Test.cpp 
+          Priority_Reactor_Test.cpp
+          Reactor_Performance_Test.cpp
 
           Thanks to Jack Erickson (jack@pinion.com) for pointing this out.
-        
+
 Tue Oct 28 11:26:39 1997  Nanbor Wang  <nw1@CHA-CHA>
 
         * ace/ace_{dll,lib}.dsp:  Moved Acceptor.cpp from Source file
diff --git a/ace/OS.i b/ace/OS.i
index de971d460ea..182ecb98cf1 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -1092,7 +1092,7 @@ ACE_OS::strcasecmp (const char *s, const char *t)
      {
        for (;
             *s != '\0' && *t != '\0';
-            ++s; ++t)
+            ++s, ++t)
          if (ACE_OS::tolower (*s) != ACE_OS::tolower (*t))
            {
              result = ((ACE_OS::tolower (*s) < ACE_OS::tolower (*t)) ? -1 : 1);
@@ -1131,7 +1131,6 @@ ACE_OS::strncasecmp (const char *s, const char *t, size_t len)
 
       ++s; ++t; --len;
     }
-  }
 
   return result; // == 0 for match, else 1
 #else
@@ -7405,6 +7404,13 @@ ACE_OS::tolower (wint_t c)
   return ::towlower (c);
 }
 
+ACE_INLINE size_t
+ACE_OS::strlen (const wchar_t *s)
+{
+  // ACE_TRACE ("ACE_OS::strlen");
+  return ::wcslen (s);
+}
+
 ACE_INLINE int
 ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t)
 {
@@ -7423,7 +7429,7 @@ ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t)
      {
        for (;
             *s != '\0' && *t != '\0';
-            ++s; ++t)
+            ++s, ++t)
          if (ACE_OS::tolower (*s) != ACE_OS::tolower (*t))
            {
              result = ((ACE_OS::tolower (*s) < ACE_OS::tolower (*t)) ? -1 : 1);
@@ -7460,7 +7466,6 @@ ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len)
 
       ++s; ++t; --len;
     }
-  }
 
   return result; // == 0 for match, else 1
 
@@ -7476,13 +7481,6 @@ ACE_OS::strncmp (const wchar_t *s, const wchar_t *t, size_t len)
   return ::wcsncmp (s, t, len);
 }
 
-ACE_INLINE size_t
-ACE_OS::strlen (const wchar_t *s)
-{
-  // ACE_TRACE ("ACE_OS::strlen");
-  return ::wcslen (s);
-}
-
 ACE_INLINE wchar_t *
 ACE_OS::strncpy (wchar_t *s, const wchar_t *t, size_t len)
 {