Merge pull request #367 from jwillemsen/master

Fixed some typos and updated some Android API version checks

3 files changed, 10 insertions, 10 deletions

diff --git a/ACE/ace/Ping_Socket.cpp b/ACE/ace/Ping_Socket.cpp
index a475fc79ea5..3779ca2526a 100644
--- a/ACE/ace/Ping_Socket.cpp
+++ b/ACE/ace/Ping_Socket.cpp
@@ -39,7 +39,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #else  /* #if ! defined (ACE_WIN32) */
 
 /*
- * This was a surpise to me...  This stuff is not defined anywhere under MSVC.
+ * This was a surprise to me...  This stuff is not defined anywhere under MSVC.
  * These values have only been checked for NT4 and Win2K.  They were taken from
  * the MSDN ping.c program and modified.
  */
@@ -117,7 +117,7 @@ ACE_Ping_Socket::ACE_Ping_Socket (ACE_Addr const & local,
     }
 
   // trying to increase the size of socket receive buffer - some
-  // protection from multiple responces e.g., when falling to the
+  // protection from multiple responses e.g., when falling to the
   // multi-cast address
   int size = 64 * 1024;
   ACE_SOCK::set_option (SOL_SOCKET,
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h
index 8b59463a53f..9cefc12bdf0 100644
--- a/ACE/ace/config-android.h
+++ b/ACE/ace/config-android.h
@@ -46,7 +46,7 @@
 #define ACE_LACKS_SYS_SHM_H
 #define ACE_LACKS_SYS_SYSCTL_H
 
-#if __ANDROID_API__ < 24
+#if __ANDROID_API__ < 21
 # define ACE_LACKS_UCONTEXT_H
 #else
 # define ACE_HAS_UCONTEXT_T
@@ -131,7 +131,7 @@
 # define ACE_HAS_ISASTREAM_PROTOTYPE
 # define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
 # define ACE_HAS_CPU_SET_T
-#elif __ANDROID_API__ >= 24
+#elif __ANDROID_API__ >= 21
 # define ACE_HAS_CPU_SET_T
 #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/README.txt b/TAO/orbsvcs/orbsvcs/HTIOP/README.txt
index 7df8960f972..d4d1e86052e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/README.txt
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/README.txt
@@ -34,7 +34,7 @@ peers to identify many different clients, which may reside on locally
 similar or non-routable networks, such as 10.*.*.* or 192.168.*.*.
 
 HTIOP_Factory - This is the service configuration class used to load
-the pluggable protocol via the ACE Service Configuratior. The
+the pluggable protocol via the ACE Service Configurator. The
 HTIOP_Factory takes the following initialization arguments:
 
 -config <filename> Specifies the text file containing HTBP specific
@@ -76,16 +76,16 @@ TAO to utilize the HTBP Protocol.
 3.  Directory Structure
 
 . $ACE_ROOT/ace/HTBP
-	Files used for implementing the low level HTBP Protocol.
+  Files used for implementing the low level HTBP Protocol.
 
 . $TAO_ROOT/orbsvcs/orbsvcs/HTIOP
-	Files that implements HTIOP protocol.
+  Files that implements HTIOP protocol.
 
 . $ACE_ROOT/tests/HTBP
-	Tests for the low level HTBP Protocol.
+  Tests for the low level HTBP Protocol.
 
 . $TAO_ROOT/orbsvcs/tests/HTIOP
-	Tests for the HTIOP protocol.
+  Tests for the HTIOP protocol.
 
 4. Requirements for using HTBP Protocol
   Refer to ace/HTBP/README for details on configuring HTBP clients
@@ -108,7 +108,7 @@ TAO to utilize the HTBP Protocol.
 
   A second challenge is that while a proxy will open multiple TCP/IP
   connections to a server (the outside peer), when faced with multiple
-  simultanious HTTP requests, it will reuse those connections at will
+  simultaneous HTTP requests, it will reuse those connections at will
   to forward any subsequent requests. This means that a socket is
   associated with a particular HTIOP session for only one HTTP
   request/reply.