Added control for default inlined-functions.

114 files changed, 417 insertions, 182 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index e2db3ffbc97..73d6ed66ad5 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -12,6 +12,10 @@
 #include "ace/Process.h"
 #include "ace/Version.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/ACE.i"
+#endif
+
 // Hex characters.
 const char ACE::hex_chars_[] = "0123456789abcdef";
 
diff --git a/ace/ACE.h b/ace/ACE.h
index 26756f1f3ff..f1ec2cca833 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -595,6 +595,8 @@ private:
   // Hex characters.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/ACE.i"
+#endif
 
 #endif  /* ACE_ACE_H */
diff --git a/ace/ACE.i b/ace/ACE.i
index 6f48bf29471..79a7682d9e3 100644
--- a/ace/ACE.i
+++ b/ace/ACE.i
@@ -3,7 +3,7 @@
 
 // Miscellaneous static methods used throughout ACE.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE::send (ACE_HANDLE handle, const void *buf, size_t len)
 {
   ACE_TRACE ("ACE::send");
@@ -15,14 +15,14 @@ ACE::send (ACE_HANDLE handle, const void *buf, size_t len)
 #endif /* ACE_WIN32 */
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE::send (ACE_HANDLE handle, const void *buf, size_t len, int flags)
 {
   ACE_TRACE ("ACE::send");
   return ACE_OS::send (handle, (const char *) buf, len, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE::recv (ACE_HANDLE handle, void *buf, size_t len)
 {
   ACE_TRACE ("ACE::recv");
@@ -33,7 +33,7 @@ ACE::recv (ACE_HANDLE handle, void *buf, size_t len)
 #endif /* ACE_WIN32 */
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE::recv (ACE_HANDLE handle, void *buf, size_t len, int flags)
 {
   ACE_TRACE ("ACE::recv");
@@ -41,7 +41,7 @@ ACE::recv (ACE_HANDLE handle, void *buf, size_t len, int flags)
   return ACE_OS::recv (handle, (char *) buf, len, flags);
 }
 
-inline char *
+ASYS_INLINE char *
 ACE::strecpy (char *s, const char *t)
 {
   ACE_TRACE ("ACE::strecpy");
@@ -55,7 +55,7 @@ ACE::strecpy (char *s, const char *t)
 }
 
 #if defined (ACE_HAS_UNICODE)
-inline wchar_t *
+ASYS_INLINE wchar_t *
 ACE::strecpy (wchar_t *s, const wchar_t *t)
 {
   ACE_TRACE ("ACE::strecpy");
@@ -71,7 +71,7 @@ ACE::strecpy (wchar_t *s, const wchar_t *t)
 
 // Return flags currently associated with handle.
 
-inline int
+ASYS_INLINE int
 ACE::get_flags (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE::get_flags");
@@ -87,7 +87,7 @@ ACE::get_flags (ACE_HANDLE handle)
 #endif /* ACE_LACKS_FCNTL */
 }
 
-inline u_long
+ASYS_INLINE u_long
 ACE::log2 (u_long num)
 {
   u_long log = 0;
@@ -100,13 +100,13 @@ ACE::log2 (u_long num)
   return log;
 }
 
-inline char 
+ASYS_INLINE char 
 ACE::nibble2hex (u_int n)
 {
   return ACE::hex_chars_[n & 0x0f];
 }
 
-inline u_char 
+ASYS_INLINE u_char 
 ACE::hex2byte (char c)
 {
   if (isdigit (c))
diff --git a/ace/DEV.cpp b/ace/DEV.cpp
index 7133a045193..b746e561374 100644
--- a/ace/DEV.cpp
+++ b/ace/DEV.cpp
@@ -5,6 +5,10 @@
 #define ACE_BUILD_DLL
 #include "ace/DEV.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/DEV.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV)
 
 void
diff --git a/ace/DEV.h b/ace/DEV.h
index 73be717d46c..495fcb75b35 100644
--- a/ace/DEV.h
+++ b/ace/DEV.h
@@ -59,6 +59,8 @@ protected:
   // Ensure that this class is an abstract base class 
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/DEV.i"
+#endif
 
 #endif /* ACE_DEV_H */
diff --git a/ace/DEV.i b/ace/DEV.i
index 8b01156e51c..529824f129c 100644
--- a/ace/DEV.i
+++ b/ace/DEV.i
@@ -3,7 +3,7 @@
 
 // DEV.i
 
-inline int
+ASYS_INLINE int
 ACE_DEV::disable (int signum) const
 {
 #if defined (ACE_WIN32)
diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp
index 967e7adb6f6..e15b128caad 100644
--- a/ace/DEV_Connector.cpp
+++ b/ace/DEV_Connector.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/DEV_Connector.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/DEV_Connector.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector)
 
 void
diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h
index edf62216bbb..7c706e5d697 100644
--- a/ace/DEV_Connector.h
+++ b/ace/DEV_Connector.h
@@ -87,6 +87,8 @@ public:
   typedef ACE_DEV_IO   PEER_STREAM;
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/DEV_Connector.i"
+#endif
 
 #endif /* ACE_DEV_CONNECTOR_H */
diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.i
index 8b6f634e2ac..a522ede7f4e 100644
--- a/ace/DEV_Connector.i
+++ b/ace/DEV_Connector.i
@@ -5,7 +5,7 @@
 
 // Creates a Local ACE_DEV. 
 
-inline
+ASYS_INLINE
 ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, 
 				      const ACE_DEV_Addr &remote_sap,
 				      ACE_Time_Value *timeout,
@@ -22,7 +22,7 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io,
 	       remote_sap.get_path_name (), ASYS_TEXT ("ACE_DEV_IO")));
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_DEV_Connector::reset_new_handle (ACE_HANDLE handle)
 {
   ACE_UNUSED_ARG (handle);
diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp
index 6cddbcfb15c..25d2a5c55e1 100644
--- a/ace/DEV_IO.cpp
+++ b/ace/DEV_IO.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/DEV_IO.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/DEV_IO.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_IO)
 
 // Return the local endpoint address.
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index 42f26b1bb2a..f5362f6989e 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -115,6 +115,8 @@ private:
   // Address of device we are connected to.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/DEV_IO.i"
+#endif
 
 #endif /* ACE_DEV_IO_H */
diff --git a/ace/DEV_IO.i b/ace/DEV_IO.i
index 3faad385161..934c1ae3e94 100644
--- a/ace/DEV_IO.i
+++ b/ace/DEV_IO.i
@@ -6,7 +6,7 @@
 // Send exactly N bytes from BUF to this device.  Keeping trying until
 // this many bytes are sent.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::send_n (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_DEV_IO::send_n");
@@ -16,42 +16,42 @@ ACE_DEV_IO::send_n (const void *buf, size_t n) const
 // Receive exactly N bytes from this file into BUF.  Keep trying until
 // this many bytes are received.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::recv_n (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_DEV_IO::recv_n");
   return ACE::read_n (this->get_handle (), buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::send (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_DEV_IO::send");
   return ACE_OS::write (this->get_handle (), (const char *) buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::recv (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_DEV_IO::recv");
   return ACE_OS::read (this->get_handle (), (char *) buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::send (const iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_DEV_IO::send");
   return ACE_OS::writev (this->get_handle (), (iovec *) iov, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::recv (iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_DEV_IO::recv");
   return ACE_OS::readv (this->get_handle (), (iovec *) iov, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::send (const void *buf, size_t n,
 		       ACE_OVERLAPPED *overlapped) const
 {
@@ -61,7 +61,7 @@ ACE_DEV_IO::send (const void *buf, size_t n,
 			overlapped);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::recv (void *buf, size_t n,
 		       ACE_OVERLAPPED *overlapped) const
 {
@@ -71,28 +71,28 @@ ACE_DEV_IO::recv (void *buf, size_t n,
 }
 
 #if defined (ACE_HAS_STREAM_PIPES)
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const
 {
   ACE_TRACE ("ACE_DEV_IO::recv");
   return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const
 {
   ACE_TRACE ("ACE_DEV_IO::send");
   return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const
 {
   ACE_TRACE ("ACE_DEV_IO::recv");
   return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_DEV_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const
 {
   ACE_TRACE ("ACE_DEV_IO::send");
diff --git a/ace/Date_Time.cpp b/ace/Date_Time.cpp
index 0aeb72780f0..5765f96f572 100644
--- a/ace/Date_Time.cpp
+++ b/ace/Date_Time.cpp
@@ -3,3 +3,8 @@
 
 #define ACE_BUILD_DLL
 #include "ace/Date_Time.h"
+
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/Date_Time.i"
+#endif
+
diff --git a/ace/Date_Time.h b/ace/Date_Time.h
index faa1c508e84..8c8fa867d0d 100644
--- a/ace/Date_Time.h
+++ b/ace/Date_Time.h
@@ -86,6 +86,8 @@ private:
   long microsec_;
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/Date_Time.i"
+#endif
 
 #endif /* ACE_DATE_TIME_H */
diff --git a/ace/Date_Time.i b/ace/Date_Time.i
index 829e91c003f..bfae34af0a3 100644
--- a/ace/Date_Time.i
+++ b/ace/Date_Time.i
@@ -4,7 +4,7 @@
 // Date_Time.i
 
 // constructor with init values, no check for validy
-inline
+ASYS_INLINE
 ACE_Date_Time::ACE_Date_Time(long day,
 			     long month,
 			     long year,
@@ -26,7 +26,7 @@ ACE_Date_Time::ACE_Date_Time(long day,
 // set/get portions of ACE_Date_Time, no check for validy
 
 // get day
-inline long 
+ASYS_INLINE long 
 ACE_Date_Time::day (void)
 {
   ACE_TRACE ("ACE_Date_Time::day");
@@ -34,7 +34,7 @@ ACE_Date_Time::day (void)
 }
 
 // set day
-inline void 
+ASYS_INLINE void 
 ACE_Date_Time::day (long day)
 {
   ACE_TRACE ("ACE_Date_Time::day");
@@ -42,7 +42,7 @@ ACE_Date_Time::day (long day)
 }
 
 // get month
-inline long 
+ASYS_INLINE long 
 ACE_Date_Time::month (void)
 {
   ACE_TRACE ("ACE_Date_Time::month");
@@ -50,7 +50,7 @@ ACE_Date_Time::month (void)
 }
 
 // set month
-inline void 
+ASYS_INLINE void 
 ACE_Date_Time::month (long month)
 {
   ACE_TRACE ("ACE_Date_Time::month");
@@ -58,7 +58,7 @@ ACE_Date_Time::month (long month)
 }
 
 // get year
-inline long 
+ASYS_INLINE long 
 ACE_Date_Time::year (void)
 {
   ACE_TRACE ("ACE_Date_Time::year");
@@ -66,7 +66,7 @@ ACE_Date_Time::year (void)
 }
 
 // set year
-inline void 
+ASYS_INLINE void 
 ACE_Date_Time::year (long year)
 {
   ACE_TRACE ("ACE_Date_Time::year");
@@ -74,7 +74,7 @@ ACE_Date_Time::year (long year)
 }
 
 // get hour
-inline long 
+ASYS_INLINE long 
 ACE_Date_Time::hour (void)
 {
   ACE_TRACE ("ACE_Date_Time::hour");
@@ -82,7 +82,7 @@ ACE_Date_Time::hour (void)
 }
 
 // set hour
-inline void 
+ASYS_INLINE void 
 ACE_Date_Time::hour (long hour)
 {
   ACE_TRACE ("ACE_Date_Time::hour");
@@ -90,7 +90,7 @@ ACE_Date_Time::hour (long hour)
 }
 
 // get minute
-inline long 
+ASYS_INLINE long 
 ACE_Date_Time::minute (void)
 {
   ACE_TRACE ("ACE_Date_Time::minute");
@@ -98,7 +98,7 @@ ACE_Date_Time::minute (void)
 }
 
 // set minute
-inline void 
+ASYS_INLINE void 
 ACE_Date_Time::minute (long minute)
 {
   ACE_TRACE ("ACE_Date_Time::minute");
@@ -106,7 +106,7 @@ ACE_Date_Time::minute (long minute)
 }
 
 // get second
-inline long 
+ASYS_INLINE long 
 ACE_Date_Time::second (void)
 {
   ACE_TRACE ("ACE_Date_Time::second");
@@ -114,7 +114,7 @@ ACE_Date_Time::second (void)
 }
 
 // set second
-inline void 
+ASYS_INLINE void 
 ACE_Date_Time::second (long second)
 {
   ACE_TRACE ("ACE_Date_Time::second");
@@ -122,7 +122,7 @@ ACE_Date_Time::second (long second)
 }
 
 // get microsec
-inline long 
+ASYS_INLINE long 
 ACE_Date_Time::microsec (void)
 {
   ACE_TRACE ("ACE_Date_Time::microsec");
@@ -130,7 +130,7 @@ ACE_Date_Time::microsec (void)
 }
 
 // set microsec
-inline void 
+ASYS_INLINE void 
 ACE_Date_Time::microsec (long microsec)
 {
   ACE_TRACE ("ACE_Date_Time::microsec");
diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp
index ac32c059296..ce2ce951fcf 100644
--- a/ace/FIFO_Recv.cpp
+++ b/ace/FIFO_Recv.cpp
@@ -6,6 +6,10 @@
 #define ACE_BUILD_DLL
 #include "ace/FIFO_Recv.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/FIFO_Recv.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv)
 
 void
diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h
index 2cd3d8c14c2..7698f0aafef 100644
--- a/ace/FIFO_Recv.h
+++ b/ace/FIFO_Recv.h
@@ -63,6 +63,8 @@ private:
   // Auxiliary handle that is used to implement persistent FIFOs.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/FIFO_Recv.i"
+#endif
 
 #endif /* ACE_FIFO_RECV_H */
diff --git a/ace/FIFO_Recv.i b/ace/FIFO_Recv.i
index 51ae81efca8..693b2a944fe 100644
--- a/ace/FIFO_Recv.i
+++ b/ace/FIFO_Recv.i
@@ -3,14 +3,14 @@
 
 // FIFO_Recv.i
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Recv::recv (void *buf, size_t len)
 {
   ACE_TRACE ("ACE_FIFO_Recv::recv");
   return ACE_OS::read (this->get_handle (), (char *) buf, len);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Recv::recv_n (void *buf, size_t n)
 {
   ACE_TRACE ("ACE_FIFO_Recv::recv_n");
diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp
index eca87670fd2..f5d73076c41 100644
--- a/ace/FIFO_Recv_Msg.cpp
+++ b/ace/FIFO_Recv_Msg.cpp
@@ -6,6 +6,10 @@
 #define ACE_BUILD_DLL
 #include "ace/FIFO_Recv_Msg.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/FIFO_Recv_Msg.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv_Msg)
 
 void
diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h
index 9c6ff057448..0269f2de91b 100644
--- a/ace/FIFO_Recv_Msg.h
+++ b/ace/FIFO_Recv_Msg.h
@@ -68,6 +68,8 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/FIFO_Recv_Msg.i"
+#endif
 
 #endif /* ACE_FIFO_RECV_MSG_H */
diff --git a/ace/FIFO_Recv_Msg.i b/ace/FIFO_Recv_Msg.i
index 8d4544f3272..dce1d06e29a 100644
--- a/ace/FIFO_Recv_Msg.i
+++ b/ace/FIFO_Recv_Msg.i
@@ -7,7 +7,7 @@
 // ACE_HAS_STREAM_PIPES vs. if it doesn't...  See the manual page on
 // getmsg(2) and read(2) for more details.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
 {
   ACE_TRACE ("ACE_FIFO_Recv_Msg::recv");
@@ -29,7 +29,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg)
 #endif /* ACE_HAS_STREAM_PIPES */
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Recv_Msg::recv (void *buf, size_t max_len)
 {
   ACE_TRACE ("ACE_FIFO_Recv_Msg::recv");
@@ -39,7 +39,7 @@ ACE_FIFO_Recv_Msg::recv (void *buf, size_t max_len)
 }
 
 #if defined (ACE_HAS_STREAM_PIPES)
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf *data,
 			 ACE_Str_Buf *cntl,
 			 int *flags)
@@ -51,7 +51,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf *data,
 			 flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Recv_Msg::recv (int *band,
 			 ACE_Str_Buf *data,
 			 ACE_Str_Buf *cntl,
diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp
index 394f6042f91..e443c2a77f5 100644
--- a/ace/FIFO_Send.cpp
+++ b/ace/FIFO_Send.cpp
@@ -6,6 +6,10 @@
 #define ACE_BUILD_DLL
 #include "ace/FIFO_Send.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/FIFO_Send.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send)
 
 void
diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h
index 757846d292e..9106cb3a97d 100644
--- a/ace/FIFO_Send.h
+++ b/ace/FIFO_Send.h
@@ -54,7 +54,9 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/FIFO_Send.i"
+#endif
 
 #endif /* ACE_FIFO_SEND_H */
 
diff --git a/ace/FIFO_Send.i b/ace/FIFO_Send.i
index 5785229f167..c7e20eae8d2 100644
--- a/ace/FIFO_Send.i
+++ b/ace/FIFO_Send.i
@@ -3,14 +3,14 @@
 
 // FIFO_Send.i
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Send::send (const void *buf, size_t len)
 {
   ACE_TRACE ("ACE_FIFO_Send::send");
   return ACE_OS::write (this->get_handle (), (const char *) buf, len);	
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Send::send_n (const void *buf, size_t n)
 {
   ACE_TRACE ("ACE_FIFO_Send::send_n");
diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp
index 2baf4e95dab..bb2a7f2ad98 100644
--- a/ace/FIFO_Send_Msg.cpp
+++ b/ace/FIFO_Send_Msg.cpp
@@ -6,6 +6,10 @@
 #define ACE_BUILD_DLL
 #include "ace/FIFO_Send_Msg.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/FIFO_Send_Msg.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg)
 
 void
diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h
index cc55b9188fa..92e0cee2a56 100644
--- a/ace/FIFO_Send_Msg.h
+++ b/ace/FIFO_Send_Msg.h
@@ -68,7 +68,9 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/FIFO_Send_Msg.i"
+#endif
 
 #endif /* ACE_FIFO_SEND_MSG_H */
 
diff --git a/ace/FIFO_Send_Msg.i b/ace/FIFO_Send_Msg.i
index 7d6b767cc4b..e81484983c2 100644
--- a/ace/FIFO_Send_Msg.i
+++ b/ace/FIFO_Send_Msg.i
@@ -3,7 +3,7 @@
 
 // FIFO_Send_Msg.i
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Send_Msg::send (const void *buf, size_t len)
 {
   ACE_TRACE ("ACE_FIFO_Send_Msg::send");
@@ -13,7 +13,7 @@ ACE_FIFO_Send_Msg::send (const void *buf, size_t len)
 }
 
 #if defined (ACE_HAS_STREAM_PIPES)
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Send_Msg::send (const ACE_Str_Buf *data, 
 			 const ACE_Str_Buf *cntl, 
 			 int flags)
@@ -25,7 +25,7 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf *data,
 			 flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FIFO_Send_Msg::send (int band, 
 			 const ACE_Str_Buf *data, 
 			 const ACE_Str_Buf *cntl, 
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index 4d5770eb7ae..442d3c8fd2b 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -7,6 +7,10 @@
 #define ACE_BUILD_DLL
 #include "ace/FILE.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/FILE.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE)
 
 void
diff --git a/ace/FILE.h b/ace/FILE.h
index 7819d333c5c..0720728232c 100644
--- a/ace/FILE.h
+++ b/ace/FILE.h
@@ -85,6 +85,8 @@ protected:
   // Ensure that this class is an abstract base class 
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/FILE.i"
+#endif
 
 #endif /* ACE_FILE_H */
diff --git a/ace/FILE.i b/ace/FILE.i
index 0a916f0f0d0..cf1f4986479 100644
--- a/ace/FILE.i
+++ b/ace/FILE.i
@@ -3,7 +3,7 @@
 
 // FILE.i
 
-inline int
+ASYS_INLINE int
 ACE_FILE::disable (int signum) const
 {
 #if defined (ACE_WIN32)
diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp
index 2e23a94747b..f313e5d92ff 100644
--- a/ace/FILE_Connector.cpp
+++ b/ace/FILE_Connector.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/FILE_Connector.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/FILE_Connector.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Connector)
 
 void
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index a3ef60a8422..be56edf2f4d 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -89,6 +89,8 @@ public:
   typedef ACE_FILE_IO   PEER_STREAM;
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/FILE_Connector.i"
+#endif
 
 #endif /* ACE_FILE_CONNECTOR_H */
diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i
index 644cfcbe64a..a05db9b8e3d 100644
--- a/ace/FILE_Connector.i
+++ b/ace/FILE_Connector.i
@@ -5,7 +5,7 @@
 
 // Creates a Local ACE_FILE. 
 
-inline
+ASYS_INLINE
 ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, 
 					const ACE_FILE_Addr &remote_sap,
 					ACE_Time_Value *timeout,
@@ -22,7 +22,7 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io,
 	       remote_sap.get_path_name (), "ACE_FILE_IO"));
 }
 
-inline int
+ASYS_INLINE int
 ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle)
 {
   ACE_UNUSED_ARG (handle);
diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp
index 03719bc8804..b3e676065be 100644
--- a/ace/FILE_IO.cpp
+++ b/ace/FILE_IO.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/FILE_IO.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/FILE_IO.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO)
 
 void
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 4867da1663e..b7ddcbce2c8 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -116,6 +116,8 @@ private:
   // File we are "connected" with...
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/FILE_IO.i"
+#endif
 
 #endif /* ACE_FILE_IO_H */
diff --git a/ace/FILE_IO.i b/ace/FILE_IO.i
index f68c88acdf2..1dd742fef87 100644
--- a/ace/FILE_IO.i
+++ b/ace/FILE_IO.i
@@ -6,7 +6,7 @@
 // Send exactly N bytes from BUF to this file.  Keeping trying until
 // this many bytes are sent.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::send_n (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_FILE_IO::send_n");
@@ -16,35 +16,35 @@ ACE_FILE_IO::send_n (const void *buf, size_t n) const
 // Receive exactly N bytes from this file into BUF.  Keep trying until
 // this many bytes are received.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::recv_n (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_FILE_IO::recv_n");
   return ACE::read_n (this->get_handle (), buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::send (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_FILE_IO::send");
   return ACE_OS::write (this->get_handle (), (const char *) buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::recv (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_FILE_IO::recv");
   return ACE_OS::read (this->get_handle (), (char *) buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::send (const iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_FILE_IO::send");
   return ACE_OS::writev (this->get_handle (), (iovec *) iov, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::recv (iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_FILE_IO::recv");
@@ -52,35 +52,35 @@ ACE_FILE_IO::recv (iovec iov[], size_t n) const
 }
 
 #if defined (ACE_HAS_STREAM_PIPES)
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const
 {
   ACE_TRACE ("ACE_FILE_IO::recv");
   return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const
 {
   ACE_TRACE ("ACE_FILE_IO::send");
   return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const
 {
   ACE_TRACE ("ACE_FILE_IO::recv");
   return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const
 {
   ACE_TRACE ("ACE_FILE_IO::send");
   return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::send (const void *buf, size_t n,
 		       ACE_OVERLAPPED *overlapped) const
 {
@@ -90,7 +90,7 @@ ACE_FILE_IO::send (const void *buf, size_t n,
 			overlapped);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_FILE_IO::recv (void *buf, size_t n,
 		       ACE_OVERLAPPED *overlapped) const
 {
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index 32c3e5ed172..a252d2f24c9 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/IO_SAP.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/IO_SAP.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_IO_SAP)
 
 // This is the do-nothing constructor.  It does not perform a
diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h
index 1d94073fcc0..5ca0d037fee 100644
--- a/ace/IO_SAP.h
+++ b/ace/IO_SAP.h
@@ -65,6 +65,8 @@ private:
   // Cache the process ID. 
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/IO_SAP.i"
+#endif
 
 #endif /* ACE_IO_SAP_H */
diff --git a/ace/IO_SAP.i b/ace/IO_SAP.i
index f13fe9db8d7..3d87ca16d80 100644
--- a/ace/IO_SAP.i
+++ b/ace/IO_SAP.i
@@ -5,7 +5,7 @@
 
 // Used to return the underlying handle_. 
 
-inline ACE_HANDLE
+ASYS_INLINE ACE_HANDLE
 ACE_IO_SAP::get_handle (void) const
 {
   ACE_TRACE ("ACE_IO_SAP::get_handle");
@@ -14,7 +14,7 @@ ACE_IO_SAP::get_handle (void) const
 
 // Used to set the underlying handle_.
 
-inline void
+ASYS_INLINE void
 ACE_IO_SAP::set_handle (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE_IO_SAP::set_handle");
@@ -23,7 +23,7 @@ ACE_IO_SAP::set_handle (ACE_HANDLE handle)
 
 // Provides access to the ACE_OS::ioctl system call. 
 
-inline int 
+ASYS_INLINE int 
 ACE_IO_SAP::control (int cmd, void *arg) const
 {
   ACE_TRACE ("ACE_IO_SAP::control");
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index 744e7f2ce50..0747ed7be7e 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -3,6 +3,10 @@
 #define ACE_BUILD_DLL
 #include "ace/IPC_SAP.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/IPC_SAP.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
 
 void
diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h
index 5149810cf4c..2081d5de64c 100644
--- a/ace/IPC_SAP.h
+++ b/ace/IPC_SAP.h
@@ -60,6 +60,8 @@ private:
   // Cache the process ID. 
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/IPC_SAP.i"
+#endif
 
 #endif /* ACE_IPC_SAP_H */
diff --git a/ace/IPC_SAP.i b/ace/IPC_SAP.i
index 930be9c991e..4d3f0dbbead 100644
--- a/ace/IPC_SAP.i
+++ b/ace/IPC_SAP.i
@@ -5,7 +5,7 @@
 
 // Used to return the underlying handle_. 
 
-inline ACE_HANDLE
+ASYS_INLINE ACE_HANDLE
 ACE_IPC_SAP::get_handle (void) const
 {
   ACE_TRACE ("ACE_IPC_SAP::get_handle");
@@ -14,7 +14,7 @@ ACE_IPC_SAP::get_handle (void) const
 
 // Used to set the underlying handle_. 
 
-inline void
+ASYS_INLINE void
 ACE_IPC_SAP::set_handle (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE_IPC_SAP::set_handle");
@@ -23,7 +23,7 @@ ACE_IPC_SAP::set_handle (ACE_HANDLE handle)
 
 // Provides access to the ACE_OS::ioctl system call. 
 
-inline int 
+ASYS_INLINE int 
 ACE_IPC_SAP::control (int cmd, void *arg) const
 {
   ACE_TRACE ("ACE_IPC_SAP::control");
diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp
index 886fdb2763a..826814efc74 100644
--- a/ace/LSOCK.cpp
+++ b/ace/LSOCK.cpp
@@ -5,6 +5,10 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/LSOCK.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK)
 
 void
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index 9d5999f5426..7da8184d830 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -63,7 +63,9 @@ private:
   // An auxiliary handle used to avoid virtual base classes... 
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK.i"
+#endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* ACE_LOCAL_SOCK_H */
diff --git a/ace/LSOCK.i b/ace/LSOCK.i
index cddc2db5812..5734e2cc437 100644
--- a/ace/LSOCK.i
+++ b/ace/LSOCK.i
@@ -5,7 +5,7 @@
 
 // Simple-minded constructor. 
 
-inline
+ASYS_INLINE
 ACE_LSOCK::ACE_LSOCK (void)
 {
   ACE_TRACE ("ACE_LSOCK::ACE_LSOCK");
@@ -13,7 +13,7 @@ ACE_LSOCK::ACE_LSOCK (void)
 
 // Sets the underlying file descriptor.
 
-inline void
+ASYS_INLINE void
 ACE_LSOCK::set_handle (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE_LSOCK::set_handle");
@@ -22,7 +22,7 @@ ACE_LSOCK::set_handle (ACE_HANDLE handle)
 
 // Gets the underlying file descriptor.
 
-inline ACE_HANDLE
+ASYS_INLINE ACE_HANDLE
 ACE_LSOCK::get_handle (void) const
 {
   ACE_TRACE ("ACE_LSOCK::get_handle");
@@ -31,7 +31,7 @@ ACE_LSOCK::get_handle (void) const
 
 // Sets the underlying file descriptor. 
 
-inline
+ASYS_INLINE
 ACE_LSOCK::ACE_LSOCK (ACE_HANDLE handle)
   : aux_handle_ (handle)
 {
diff --git a/ace/LSOCK_CODgram.cpp b/ace/LSOCK_CODgram.cpp
index b84b1e64edc..2aa2e03e505 100644
--- a/ace/LSOCK_CODgram.cpp
+++ b/ace/LSOCK_CODgram.cpp
@@ -6,6 +6,10 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/LSOCK_CODgram.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_CODgram)
 
 void
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index 22003a3dc2e..5567639dc34 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -59,7 +59,9 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_CODgram.i"
+#endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* ACE_LOCAL_SOCK_CODGRAM_H */
diff --git a/ace/LSOCK_CODgram.i b/ace/LSOCK_CODgram.i
index 40b2330cdcd..80a6071770c 100644
--- a/ace/LSOCK_CODgram.i
+++ b/ace/LSOCK_CODgram.i
@@ -5,13 +5,13 @@
 
 // Do nothing constructor. 
 
-inline
+ASYS_INLINE
 ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (void)
 {
   ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram");
 }
 
-inline void
+ASYS_INLINE void
 ACE_LSOCK_CODgram::set_handle (ACE_HANDLE h)
 {
   ACE_TRACE ("ACE_LSOCK_CODgram::set_handle");
@@ -19,7 +19,7 @@ ACE_LSOCK_CODgram::set_handle (ACE_HANDLE h)
   this->ACE_LSOCK::set_handle (h);
 }
 
-inline ACE_HANDLE
+ASYS_INLINE ACE_HANDLE
 ACE_LSOCK_CODgram::get_handle (void) const
 {
   ACE_TRACE ("ACE_LSOCK_CODgram::get_handle");
diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp
index ba85fa8039b..abd6c9ebbcb 100644
--- a/ace/LSOCK_Connector.cpp
+++ b/ace/LSOCK_Connector.cpp
@@ -9,6 +9,10 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/LSOCK_Connector.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Connector)
 
 void
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index 8ce18b2b0e2..7e3689560bc 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -90,7 +90,9 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_Connector.i"
+#endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* ACE_LOCAL_SOCK_CONNECTOR_H */
diff --git a/ace/LSOCK_Connector.i b/ace/LSOCK_Connector.i
index fdd9834a444..4c0a18663f5 100644
--- a/ace/LSOCK_Connector.i
+++ b/ace/LSOCK_Connector.i
@@ -5,7 +5,7 @@
 
 // Establish a connection.
 
-inline int 
+ASYS_INLINE int 
 ACE_LSOCK_Connector::connect (ACE_LSOCK_Stream &new_stream, 
 			      const ACE_UNIX_Addr &remote_sap, 
 			      ACE_Time_Value *timeout,
diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp
index eb734719bdb..2f4b466b4de 100644
--- a/ace/LSOCK_Dgram.cpp
+++ b/ace/LSOCK_Dgram.cpp
@@ -6,6 +6,10 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/LSOCK_Dgram.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Dgram)
 
 void
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index 953213b3b85..ea1af4126a8 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -55,7 +55,9 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_Dgram.i"
+#endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* ACE_LOCAL_SOCK_DGRAM_H */
diff --git a/ace/LSOCK_Dgram.i b/ace/LSOCK_Dgram.i
index 51b03bb8c89..ffc1890d12b 100644
--- a/ace/LSOCK_Dgram.i
+++ b/ace/LSOCK_Dgram.i
@@ -3,7 +3,7 @@
 
 // LSOCK_Dgram.i
 
-inline void
+ASYS_INLINE void
 ACE_LSOCK_Dgram::set_handle (ACE_HANDLE h)
 {
   ACE_TRACE ("ACE_LSOCK_Dgram::set_handle");
@@ -11,7 +11,7 @@ ACE_LSOCK_Dgram::set_handle (ACE_HANDLE h)
   this->ACE_LSOCK::set_handle (h);
 }
 
-inline ACE_HANDLE
+ASYS_INLINE ACE_HANDLE
 ACE_LSOCK_Dgram::get_handle (void) const
 {
   ACE_TRACE ("ACE_LSOCK_Dgram::get_handle");
diff --git a/ace/LSOCK_Stream.cpp b/ace/LSOCK_Stream.cpp
index 02e35c2e15d..e1010cfc2dc 100644
--- a/ace/LSOCK_Stream.cpp
+++ b/ace/LSOCK_Stream.cpp
@@ -6,6 +6,10 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/LSOCK_Stream.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Stream)
 
 int
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index a53a81fdb88..c7242098036 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -62,7 +62,9 @@ public:
   // for UNIX domain sockets.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_Stream.i"
+#endif
 
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif /* ACE_LOCAL_SOCK_STREAM_H */
diff --git a/ace/LSOCK_Stream.i b/ace/LSOCK_Stream.i
index e76afa8d240..6ee0a6f90c7 100644
--- a/ace/LSOCK_Stream.i
+++ b/ace/LSOCK_Stream.i
@@ -6,7 +6,7 @@
 // Sets both the file descriptors... Overrides handle from the base
 // classes.
 
-inline void
+ASYS_INLINE void
 ACE_LSOCK_Stream::set_handle (ACE_HANDLE fd)
 {
   ACE_TRACE ("ACE_LSOCK_Stream::set_handle");
@@ -14,7 +14,7 @@ ACE_LSOCK_Stream::set_handle (ACE_HANDLE fd)
   this->ACE_LSOCK::set_handle (fd);
 }
 
-inline ACE_HANDLE
+ASYS_INLINE ACE_HANDLE
 ACE_LSOCK_Stream::get_handle (void) const
 {
   ACE_TRACE ("ACE_LSOCK_Stream::get_handle");
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 5bd8ba3903d..38407bad33b 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -5,6 +5,10 @@
 #include "ace/Log_Record.h"
 #include "ace/streams.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/LOG_Record.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Log_Record)
 
 const char *ACE_Log_Record::priority_names_[] = 
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index da54ebf42bb..2f6fd431356 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -169,5 +169,8 @@ private:
   // Symbolic names for the <ACE_Log_Priority> enums.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/Log_Record.i"
+#endif
+
 #endif /* ACE_LOG_RECORD_H */
diff --git a/ace/Log_Record.i b/ace/Log_Record.i
index f179125053d..64a82d2ffcf 100644
--- a/ace/Log_Record.i
+++ b/ace/Log_Record.i
@@ -3,7 +3,7 @@
 
 // Log_Record.i
 
-inline void
+ASYS_INLINE void
 ACE_Log_Record::encode (void)
 {
   ACE_TRACE ("ACE_Log_Record::encode");
@@ -16,7 +16,7 @@ ACE_Log_Record::encode (void)
   this->pid_ = htonl (this->pid_);
 }
 
-inline void
+ASYS_INLINE void
 ACE_Log_Record::decode (void)
 {
   ACE_TRACE ("ACE_Log_Record::decode");
@@ -27,63 +27,63 @@ ACE_Log_Record::decode (void)
   this->length_ = ntohl (this->length_);
 }
 
-inline long 
+ASYS_INLINE long 
 ACE_Log_Record::type (void) const
 {
   ACE_TRACE ("ACE_Log_Record::type");
   return this->type_;
 }
 
-inline void 
+ASYS_INLINE void 
 ACE_Log_Record::type (long t)
 {
   ACE_TRACE ("ACE_Log_Record::type");
   this->type_ = t;
 }
 
-inline long 
+ASYS_INLINE long 
 ACE_Log_Record::length (void) const
 {
   ACE_TRACE ("ACE_Log_Record::length");
   return this->length_;
 }
 
-inline void 
+ASYS_INLINE void 
 ACE_Log_Record::length (long l)
 {
   ACE_TRACE ("ACE_Log_Record::length");
   this->length_ = l;
 }
 
-inline const ACE_Time_Value &
+ASYS_INLINE const ACE_Time_Value &
 ACE_Log_Record::time_stamp (void) const
 {
   ACE_TRACE ("ACE_Log_Record::time_stamp");
   return this->time_stamp_;
 }
 
-inline void 
+ASYS_INLINE void 
 ACE_Log_Record::time_stamp (const ACE_Time_Value &ts)
 {
   ACE_TRACE ("ACE_Log_Record::time_stamp");
   this->time_stamp_ = ts;
 }
 
-inline long 
+ASYS_INLINE long 
 ACE_Log_Record::pid (void) const
 {
   ACE_TRACE ("ACE_Log_Record::pid");
   return this->pid_;
 }
 
-inline void 
+ASYS_INLINE void 
 ACE_Log_Record::pid (long p)
 {
   ACE_TRACE ("ACE_Log_Record::pid");
   this->pid_ = p;
 }
 
-inline ASYS_TCHAR *
+ASYS_INLINE ASYS_TCHAR *
 ACE_Log_Record::msg_data (void)
 {
   ACE_TRACE ("ACE_Log_Record::msg_data");
diff --git a/ace/OS.h b/ace/OS.h
index 3605a4fffb0..ee541276df8 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -5607,8 +5607,8 @@ private:
 # if defined (ASYS_INLINE)
 #   undef ASYS_INLINE
 # endif /* ASYS_INLINE */
-# define ASYS_INLINE inline
 #else
+# define ASYS_INLINE inline
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index 8cb1d2e84d9..cb0a18b0cf7 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -6,6 +6,10 @@
 #include "ace/SOCK_Connector.h"
 #include "ace/Pipe.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/Pipe.i"
+#endif
+
 void
 ACE_Pipe::dump (void) const
 {
diff --git a/ace/Pipe.h b/ace/Pipe.h
index 94b1f678f1f..664d1a7253d 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -68,6 +68,8 @@ private:
   ACE_HANDLE handles_[2];
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/Pipe.i"
+#endif
 
 #endif /* ACE_PIPE_H */
diff --git a/ace/Pipe.i b/ace/Pipe.i
index fd748ada175..41d07f79926 100644
--- a/ace/Pipe.i
+++ b/ace/Pipe.i
@@ -3,14 +3,14 @@
 
 // Pipe.i
 
-inline ACE_HANDLE 
+ASYS_INLINE ACE_HANDLE 
 ACE_Pipe::read_handle (void) const
 {
   ACE_TRACE ("ACE_Pipe::read_handle");
   return this->handles_[0];
 }
   
-inline ACE_HANDLE 
+ASYS_INLINE ACE_HANDLE 
 ACE_Pipe::write_handle (void) const
 {
   ACE_TRACE ("ACE_Pipe::write_handle");
diff --git a/ace/README b/ace/README
index 2fabdc7824a..c7e64f33fa7 100644
--- a/ace/README
+++ b/ace/README
@@ -138,6 +138,7 @@ ACE_HAS_XPG4_MULTIBYTE_CHAR             Platform has support for multi-byte
 ACE_LACKS_FCNTL                         Platform lacks POSIX-style fcntl ().
 ACE_LACKS_FIFO                          Platform lacks UNIX FIFOs (e.g., Win32)
 ACE_LACKS_GETS                          Platform lacks ::gets (), or it's desired to ensure that it doesn't get used.  Linux egcs g++ warns against using it.
+ACE_LACKS_INLINE_FUNCTIONS              Platform can't handle "inline" keyword correctly.
 ACE_LACKS_NETDB_REENTRANT_FUNCTIONS     Platform does not support reentrant netdb functions (getprotobyname_r, getprotobynumber_r, gethostbyaddr_r, gethostbyname_r, getservbyname_r).
 ACE_HAS_REGEX                           Platform supports the POSIX regular expression library
 ACE_HAS_SELECT_H                        Platform has special header for select().
diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp
index 914de1caddc..7d014c5a0ae 100644
--- a/ace/SOCK.cpp
+++ b/ace/SOCK.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SOCK.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK)
 
 void
diff --git a/ace/SOCK.h b/ace/SOCK.h
index 63583971950..fc4aba6d552 100644
--- a/ace/SOCK.h
+++ b/ace/SOCK.h
@@ -81,6 +81,8 @@ protected:
   // from being defined.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK.i"
+#endif
 
 #endif /* ACE_SOCK_H */
diff --git a/ace/SOCK.i b/ace/SOCK.i
index bbf4794a8af..fb8d9211ecb 100644
--- a/ace/SOCK.i
+++ b/ace/SOCK.i
@@ -3,7 +3,7 @@
 
 // SOCK.i
 
-inline int 
+ASYS_INLINE int 
 ACE_SOCK::set_option (int level, 
 		      int option, 
 		      void *optval, 
@@ -16,7 +16,7 @@ ACE_SOCK::set_option (int level,
 
 // Provides access to the ACE_OS::getsockopt system call.
 
-inline int 
+ASYS_INLINE int 
 ACE_SOCK::get_option (int level, 
 		      int option, 
 		      void *optval, 
diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp
index 71340d3e527..950693cfc52 100644
--- a/ace/SOCK_CODgram.cpp
+++ b/ace/SOCK_CODgram.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SOCK_CODgram.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK_CODgram.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_CODgram)
 
 void
diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h
index 8751a707270..2b2de5aae6a 100644
--- a/ace/SOCK_CODgram.h
+++ b/ace/SOCK_CODgram.h
@@ -52,6 +52,8 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_CODgram.i"
+#endif
 
 #endif /* ACE_SOCK_CODGRAM_H */
diff --git a/ace/SOCK_CODgram.i b/ace/SOCK_CODgram.i
index 8f72a5b117c..1476db0366c 100644
--- a/ace/SOCK_CODgram.i
+++ b/ace/SOCK_CODgram.i
@@ -3,7 +3,7 @@
 
 // SOCK_CODgram.i
 
-inline
+ASYS_INLINE
 ACE_SOCK_CODgram::ACE_SOCK_CODgram (void)
 {
   ACE_TRACE ("ACE_SOCK_CODgram::ACE_SOCK_CODgram");
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 8bbc1b0dea8..50215a46ef9 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -7,6 +7,10 @@
 #include "ace/Handle_Set.h"
 #include "ace/INET_Addr.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK_Connector.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Connector)
 
 void
diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h
index aef86b427d8..70aaef7ac65 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -102,6 +102,8 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Connector.i"
+#endif
 
 #endif /* ACE_SOCK_CONNECTOR_H */
diff --git a/ace/SOCK_Connector.i b/ace/SOCK_Connector.i
index 321f1bc8ea7..26627977c5e 100644
--- a/ace/SOCK_Connector.i
+++ b/ace/SOCK_Connector.i
@@ -6,7 +6,7 @@
 // This constructor is used by a client when it wants to connect to
 // the specified REMOTE_SAP address using a blocking open.
 
-inline
+ASYS_INLINE
 ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, 
 					const ACE_Addr &remote_sap, 
 					ACE_Time_Value *timeout,
@@ -26,13 +26,13 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream,
 
 // Do-nothing constructor...
 
-inline
+ASYS_INLINE
 ACE_SOCK_Connector::ACE_SOCK_Connector (void)
 {
   ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle)
 {
   ACE_UNUSED_ARG (handle);
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 9a142d2eda1..546501131b2 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -6,6 +6,10 @@
 #include "ace/Handle_Set.h"
 #include "ace/Synch.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK_Dgram.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram)
 
 void
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index b3531ed9ff8..d9447796b16 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -109,6 +109,8 @@ private:
   // Do not allow this function to percolate up to this interface...
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Dgram.i"
+#endif
 
 #endif /* ACE_SOCK_DGRAM_H */
diff --git a/ace/SOCK_Dgram.i b/ace/SOCK_Dgram.i
index 37af897057c..3dcf3752396 100644
--- a/ace/SOCK_Dgram.i
+++ b/ace/SOCK_Dgram.i
@@ -5,7 +5,7 @@
 
 // Here's the simple-minded constructor. 
 
-inline
+ASYS_INLINE
 ACE_SOCK_Dgram::ACE_SOCK_Dgram (void)
 {
   ACE_TRACE ("ACE_SOCK_Dgram::ACE_SOCK_Dgram");
@@ -13,7 +13,7 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (void)
 
 // <sendto> an N byte datagram to <addr> (connectionless version).
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Dgram::send (const void *buf, 
 		      size_t n, 
 		      const ACE_Addr &addr, 
@@ -29,7 +29,7 @@ ACE_SOCK_Dgram::send (const void *buf,
 
 // <recvfrom> an n byte datagram (connectionless version).
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Dgram::recv (void *buf, 
 		      size_t n, 
 		      ACE_Addr &addr, 
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index 3a149395cfa..6523c101a04 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -5,6 +5,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SOCK_Dgram_Bcast.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK_Dgram_Bcast.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast)
 
 ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr,
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index 5bf94363068..465c9d4245d 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -104,6 +104,8 @@ private:
   // Do not allow this function to percolate up to this interface...
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Dgram_Bcast.i"
+#endif
 
 #endif /* ACE_SOCK_DGRAM_BCAST_H */
diff --git a/ace/SOCK_Dgram_Bcast.i b/ace/SOCK_Dgram_Bcast.i
index 8029354e2ae..fd85e1d84e8 100644
--- a/ace/SOCK_Dgram_Bcast.i
+++ b/ace/SOCK_Dgram_Bcast.i
@@ -6,7 +6,7 @@
 // Broadcast an N byte datagram to ADDR (note that addr must be
 // preassigned to the broadcast address of the subnet...)
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Dgram_Bcast::send (const void *buf, 
 			    size_t n, 
 			    const ACE_Addr &addr, 
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 7588e6b7baa..f4eb5e21b18 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -5,6 +5,10 @@
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/INET_Addr.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK_Dgram_Mcast.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast)
 
 void
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index c3f173c6b9c..b42dc55c42c 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -105,6 +105,8 @@ private:
   // IP address.
 }; 
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Dgram_Mcast.i"
+#endif
 
 #endif /* ACE_SOCK_DGRAM_MCAST_H */
diff --git a/ace/SOCK_Dgram_Mcast.i b/ace/SOCK_Dgram_Mcast.i
index 835a3bbd135..78a83bafbcb 100644
--- a/ace/SOCK_Dgram_Mcast.i
+++ b/ace/SOCK_Dgram_Mcast.i
@@ -3,7 +3,7 @@
 
 // SOCK_Dgram_Mcast.i
 
-inline int
+ASYS_INLINE int
 ACE_SOCK_Dgram_Mcast::set_option (int option, 
 				  char optval) 
 { 
@@ -12,7 +12,7 @@ ACE_SOCK_Dgram_Mcast::set_option (int option,
 				     &optval, sizeof (char));
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Dgram_Mcast::send (const void *buf, 
 			    size_t n, int flags) const
 {
@@ -21,7 +21,7 @@ ACE_SOCK_Dgram_Mcast::send (const void *buf,
 				     this->mcast_addr_, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Dgram_Mcast::send (const iovec iov[], 
 			    size_t n, int flags) const
 {
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp
index 5a2e9090046..7d1418e3455 100644
--- a/ace/SOCK_IO.cpp
+++ b/ace/SOCK_IO.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SOCK_IO.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK_IO.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO)
 
 void
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index d7f65601b7f..d6cb964050e 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -106,6 +106,8 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_IO.i"
+#endif
 
 #endif /* ACE_SOCK_IO_H */
diff --git a/ace/SOCK_IO.i b/ace/SOCK_IO.i
index 67ae7186bf6..555e6cbcef6 100644
--- a/ace/SOCK_IO.i
+++ b/ace/SOCK_IO.i
@@ -5,7 +5,7 @@
 
 // Send an n byte message to the connected socket.
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_IO::send (const void *buf, size_t n, int flags) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
@@ -14,7 +14,7 @@ ACE_SOCK_IO::send (const void *buf, size_t n, int flags) const
 
 // Recv an n byte message from the connected socket.
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_IO::recv (void *buf, size_t n, int flags) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
@@ -23,7 +23,7 @@ ACE_SOCK_IO::recv (void *buf, size_t n, int flags) const
 
 // Send an n byte message to the connected socket.
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_IO::send (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
@@ -36,7 +36,7 @@ ACE_SOCK_IO::send (const void *buf, size_t n) const
 
 // Recv an n byte message from the connected socket.
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_IO::recv (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
@@ -49,7 +49,7 @@ ACE_SOCK_IO::recv (void *buf, size_t n) const
 
 // Send a vector of n byte messages to the connected socket.
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_IO::send (const iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
@@ -58,14 +58,14 @@ ACE_SOCK_IO::send (const iovec iov[], size_t n) const
 
 // Recv an n byte message from the connected socket.
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_IO::recv (iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
   return ACE_OS::readv (this->get_handle (), (iovec *) iov, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::send (const void *buf, size_t n,
 		   ACE_OVERLAPPED *overlapped) const
 {
@@ -75,7 +75,7 @@ ACE_SOCK_IO::send (const void *buf, size_t n,
 			overlapped);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::recv (void *buf, size_t n,
 		   ACE_OVERLAPPED *overlapped) const
 {
@@ -84,7 +84,7 @@ ACE_SOCK_IO::recv (void *buf, size_t n,
 		       overlapped);
 }
 
-inline ssize_t 
+ASYS_INLINE ssize_t 
 ACE_SOCK_IO::send (const void *buf, size_t len, int flags,
 		   const ACE_Time_Value *timeout)
 {
@@ -92,7 +92,7 @@ ACE_SOCK_IO::send (const void *buf, size_t len, int flags,
   return ACE::send (this->get_handle (), buf, len, flags, timeout);
 }
 
-inline ssize_t 
+ASYS_INLINE ssize_t 
 ACE_SOCK_IO::recv (void *buf, size_t len, int flags,
 		   const ACE_Time_Value *timeout)
 {
diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp
index 2acb22f962c..5fb5150fe1a 100644
--- a/ace/SOCK_Stream.cpp
+++ b/ace/SOCK_Stream.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SOCK_Stream.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SOCK_Stream.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Stream)
 
 void
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index f8fc16ee3c7..705078d55d4 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -91,6 +91,8 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Stream.i"
+#endif
 
 #endif /* ACE_SOCK_STREAM_H */
diff --git a/ace/SOCK_Stream.i b/ace/SOCK_Stream.i
index 93a35ad219d..b48ce0ef64f 100644
--- a/ace/SOCK_Stream.i
+++ b/ace/SOCK_Stream.i
@@ -7,7 +7,7 @@
 
 // Shut down just the reading end of a ACE_SOCK. 
 
-inline int
+ASYS_INLINE int
 ACE_SOCK_Stream::close_reader (void)
 {
   ACE_TRACE ("ACE_SOCK_Stream::close_reader");
@@ -19,7 +19,7 @@ ACE_SOCK_Stream::close_reader (void)
 
 // Shut down just the writing end of a ACE_SOCK. 
 
-inline int
+ASYS_INLINE int
 ACE_SOCK_Stream::close_writer (void)
 {
   ACE_TRACE ("ACE_SOCK_Stream::close_writer");
@@ -29,7 +29,7 @@ ACE_SOCK_Stream::close_writer (void)
     return 0;
 }
 
-inline ssize_t 
+ASYS_INLINE ssize_t 
 ACE_SOCK_Stream::send_n (const void *buf, size_t len, int flags,
 			 const ACE_Time_Value *timeout)
 {
@@ -37,7 +37,7 @@ ACE_SOCK_Stream::send_n (const void *buf, size_t len, int flags,
   return ACE::send_n (this->get_handle (), buf, len, flags, timeout);
 }
 
-inline ssize_t 
+ASYS_INLINE ssize_t 
 ACE_SOCK_Stream::recv_n (void *buf, size_t len, int flags, 
 			 const ACE_Time_Value *timeout)
 {
@@ -48,7 +48,7 @@ ACE_SOCK_Stream::recv_n (void *buf, size_t len, int flags,
 // Receive exactly BUF_SIZE bytes from file descriptor this->handle
 // into <buf>.  Keep trying until this many bytes are received.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Stream::recv_n (void *buf, int buf_size, int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::recv_n");
@@ -58,7 +58,7 @@ ACE_SOCK_Stream::recv_n (void *buf, int buf_size, int flags) const
 // Send exactly N bytes from <buf> to <handle>.  Keeping trying 
 // until this many bytes are sent. 
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Stream::send_n (const void *buf, int buf_size, int flags) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::send_n");
@@ -68,7 +68,7 @@ ACE_SOCK_Stream::send_n (const void *buf, int buf_size, int flags) const
 // Receive exactly BUF_SIZE bytes from file descriptor 
 // into BUF.  Keep trying until this many bytes are received. 
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Stream::recv_n (void *buf, int buf_size) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::recv_n");
@@ -78,21 +78,21 @@ ACE_SOCK_Stream::recv_n (void *buf, int buf_size) const
 // Send exactly N bytes from BUF to THIS->SOK_FD.  Keeping trying
 // until this many bytes are sent.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SOCK_Stream::send_n (const void *buf, int buf_size) const
 {
   ACE_TRACE ("ACE_SOCK_Stream::send_n");
   return ACE::send_n (this->get_handle (), buf, buf_size);
 }
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_Stream::send_urg (void *ptr, int len)
 {
   ACE_TRACE ("ACE_SOCK_Stream::send_urg");
   return ACE_OS::send (this->get_handle (), (char *) ptr, len, MSG_OOB);
 }
 
-inline ssize_t  
+ASYS_INLINE ssize_t  
 ACE_SOCK_Stream::recv_urg (void *ptr, int len)
 {
   ACE_TRACE ("ACE_SOCK_Stream::recv_urg");
diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp
index c70cd1ea06d..70a14cc915e 100644
--- a/ace/SPIPE.cpp
+++ b/ace/SPIPE.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SPIPE.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SPIPE.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE)
 
 // This is the do-nothing constructor. 
diff --git a/ace/SPIPE.h b/ace/SPIPE.h
index 2ab84a55acd..9f2b9b6b403 100644
--- a/ace/SPIPE.h
+++ b/ace/SPIPE.h
@@ -55,5 +55,8 @@ protected:
   // Our local address.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SPIPE.i"
+#endif
+
 #endif /* ACE_SPIPE_H */
diff --git a/ace/SPIPE.i b/ace/SPIPE.i
index 289fdad2481..fd205ab76df 100644
--- a/ace/SPIPE.i
+++ b/ace/SPIPE.i
@@ -3,7 +3,7 @@
 
 // SPIPE.i
 
-inline int
+ASYS_INLINE int
 ACE_SPIPE::disable (int signum) const
 {
 #if defined (ACE_WIN32)
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index 947a888076c..0338606f7d1 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SPIPE_Connector.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SPIPE_Connector.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Connector)
 
 // Creates a Local ACE_SPIPE. 
diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h
index 78e7f0ad0ef..d9aa7f429f2 100644
--- a/ace/SPIPE_Connector.h
+++ b/ace/SPIPE_Connector.h
@@ -90,6 +90,8 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SPIPE_Connector.i"
+#endif
 
 #endif /* ACE_SPIPE_CONNECTOR_H */
diff --git a/ace/SPIPE_Connector.i b/ace/SPIPE_Connector.i
index 49562933214..9ce4c1a7855 100644
--- a/ace/SPIPE_Connector.i
+++ b/ace/SPIPE_Connector.i
@@ -3,7 +3,7 @@
 
 // SPIPE_Connector.i
 
-inline int
+ASYS_INLINE int
 ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
 {
   ACE_UNUSED_ARG (handle);
diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp
index e151b2766bb..49a830d6d89 100644
--- a/ace/SPIPE_Stream.cpp
+++ b/ace/SPIPE_Stream.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SPIPE_Stream.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SPIPE_Stream.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Stream)
 
 void
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index e7e74d8f91d..60adbc8fede 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -116,5 +116,8 @@ private:
   ACE_SPIPE_Addr remote_addr_;
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SPIPE_Stream.i"
+#endif
+
 #endif /* ACE_SPIPE_STREAM_H */
diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i
index 0be6a9d3602..cac2db0b201 100644
--- a/ace/SPIPE_Stream.i
+++ b/ace/SPIPE_Stream.i
@@ -5,7 +5,7 @@
 
 // Create an ACE_SPIPE_Stream. 
 
-inline int
+ASYS_INLINE int
 ACE_SPIPE_Stream::get_remote_addr (ACE_SPIPE_Addr &remote_sap) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::get_remote_addr");
@@ -16,7 +16,7 @@ ACE_SPIPE_Stream::get_remote_addr (ACE_SPIPE_Addr &remote_sap) const
 // Send exactly N bytes from BUF to this socket.  Keeping trying until
 // this many bytes are sent.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::send_n (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send_n");
@@ -26,63 +26,63 @@ ACE_SPIPE_Stream::send_n (const void *buf, size_t n) const
 // Receive exactly N bytes from this socket into BUF.  Keep trying
 // until this many bytes are received.
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::recv_n (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv_n");
   return ACE::read_n (this->get_handle (), buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::send (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::write (this->get_handle (), (const char *) buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::recv (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
   return ACE_OS::read (this->get_handle (), (char *) buf, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
   return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
   return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::send (const iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::writev (this->get_handle (), (iovec *) iov, n);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::recv (iovec iov[], size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
@@ -91,7 +91,7 @@ ACE_SPIPE_Stream::recv (iovec iov[], size_t n) const
 
 // This routine sends an open file descriptor to this socket. 
 
-inline int
+ASYS_INLINE int
 ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send_handle");
@@ -105,7 +105,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const
 
 // This file receives an open file descriptor from this socket.
 
-inline int
+ASYS_INLINE int
 ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv_handle");
@@ -128,7 +128,7 @@ ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const
 // This file receives an open file descriptor from this socket and
 // also passes back the information about the address...
 
-inline int
+ASYS_INLINE int
 ACE_SPIPE_Stream::recv_handle (strrecvfd &recvfd) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv_handle");
@@ -140,7 +140,7 @@ ACE_SPIPE_Stream::recv_handle (strrecvfd &recvfd) const
 #endif /* ACE_HAS_STREAM_PIPES */
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::send (const void *buf, size_t n,
 			ACE_OVERLAPPED *overlapped) const
 {
@@ -150,7 +150,7 @@ ACE_SPIPE_Stream::send (const void *buf, size_t n,
 			overlapped);
 }
 
-inline ssize_t
+ASYS_INLINE ssize_t
 ACE_SPIPE_Stream::recv (void *buf, size_t n,
 			ACE_OVERLAPPED *overlapped) const
 {
diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp
index 1a77d462280..f2aca0c2395 100644
--- a/ace/SV_Message_Queue.cpp
+++ b/ace/SV_Message_Queue.cpp
@@ -4,6 +4,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SV_Message_Queue.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SV_Message_Queue.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message_Queue)
 
 void
diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h
index 4bab2c4f742..a1d5ed6b098 100644
--- a/ace/SV_Message_Queue.h
+++ b/ace/SV_Message_Queue.h
@@ -82,5 +82,8 @@ protected:
   // Returned from the underlying msgget() system call.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SV_Message_Queue.i"
+#endif
+
 #endif /* ACE_MESSAGE_QUEUE_H */
diff --git a/ace/SV_Message_Queue.i b/ace/SV_Message_Queue.i
index f896388232e..45fd1f4efcc 100644
--- a/ace/SV_Message_Queue.i
+++ b/ace/SV_Message_Queue.i
@@ -7,7 +7,7 @@
 
 // Open a message queue using the <external_id>.
 
-inline int
+ASYS_INLINE int
 ACE_SV_Message_Queue::open (key_t external_id, int create, int perms)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::open");
@@ -16,7 +16,7 @@ ACE_SV_Message_Queue::open (key_t external_id, int create, int perms)
 
 // What does it mean to close a message queue?!
 
-inline int
+ASYS_INLINE int
 ACE_SV_Message_Queue::close (void)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::close");
@@ -24,7 +24,7 @@ ACE_SV_Message_Queue::close (void)
   return 1;
 }
 
-inline int
+ASYS_INLINE int
 ACE_SV_Message_Queue::control (int option, void *arg)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::control");
@@ -32,7 +32,7 @@ ACE_SV_Message_Queue::control (int option, void *arg)
 			 (msqid_ds *) arg);
 }
 
-inline int
+ASYS_INLINE int
 ACE_SV_Message_Queue::remove (void)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::remove");
@@ -41,21 +41,21 @@ ACE_SV_Message_Queue::remove (void)
   return result;
 }
 
-inline int
+ASYS_INLINE int
 ACE_SV_Message_Queue::get_id (void)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::get_id");
   return this->internal_id_;
 }
 
-inline void
+ASYS_INLINE void
 ACE_SV_Message_Queue::set_id (int id)
 {
   ACE_TRACE ("ACE_SV_Message_Queue::set_id");
   this->internal_id_ = id;
 }
 
-inline int
+ASYS_INLINE int
 ACE_SV_Message_Queue::recv (ACE_SV_Message &mb, 
 			    int length, 
 			    long type, 
@@ -66,7 +66,7 @@ ACE_SV_Message_Queue::recv (ACE_SV_Message &mb,
 			 length, type, mflags);
 }
 
-inline int
+ASYS_INLINE int
 ACE_SV_Message_Queue::send (const ACE_SV_Message &mb, 
 			    int length, 
 			    int mflags)
diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp
index 703f6dafe66..0fde5f68da7 100644
--- a/ace/SV_Semaphore_Complex.cpp
+++ b/ace/SV_Semaphore_Complex.cpp
@@ -6,6 +6,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SV_Semaphore_Complex.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SV_Semaphore_Complex.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Complex)
 
 void
diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h
index 3837909a47a..b1c7b5bd906 100644
--- a/ace/SV_Semaphore_Complex.h
+++ b/ace/SV_Semaphore_Complex.h
@@ -144,5 +144,8 @@ private:
   static sembuf op_unlock_[1];
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SV_Semaphore_Complex.i"
+#endif
+
 #endif /* ACE_SV_SEMAPHORE_COMPLEX_H */
diff --git a/ace/SV_Semaphore_Complex.i b/ace/SV_Semaphore_Complex.i
index 5e06ed33fd2..82ce23bbbef 100644
--- a/ace/SV_Semaphore_Complex.i
+++ b/ace/SV_Semaphore_Complex.i
@@ -5,77 +5,77 @@
 
 #include "ace/Trace.h"
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::acquire (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire");
   return ACE_SV_Semaphore_Simple::acquire ((u_short) n + 2, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::acquire_read (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_read");
   return this->acquire (n, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::acquire_write (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_write");
   return this->acquire (n, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::tryacquire (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire");
   return ACE_SV_Semaphore_Simple::tryacquire ((u_short) n + 2, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_read");
   return this->tryacquire (n, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_write");
   return this->tryacquire (n, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::release (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::release");
   return ACE_SV_Semaphore_Simple::release ((u_short) n + 2, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::op (int val, u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::op");
   return ACE_SV_Semaphore_Simple::op (val, (u_short) n + 2, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::op (sembuf op_vec[], u_short n) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::op");
   return ACE_SV_Semaphore_Simple::op (op_vec, (u_short) n + 2);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::control (int cmd, semun arg, u_short n) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::control");
   return ACE_SV_Semaphore_Simple::control (cmd, arg, (u_short) n + 2);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Complex::control (int cmd, int value, u_short n) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Complex::control");
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index a5c611a79a8..23fd407fb8f 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -6,6 +6,10 @@
 #define ACE_BUILD_DLL
 #include "ace/SV_Semaphore_Simple.h"
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/SV_Semaphore_Simple.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Simple)
 
 void
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index a426ade6845..6c8a627cf17 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -139,5 +139,8 @@ protected:
   // LUSED characters when he wants to get a different key.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SV_Semaphore_Simple.i"
+#endif
+
 #endif /* _SV_SEMAPHORE_SIMPLE_H */
diff --git a/ace/SV_Semaphore_Simple.i b/ace/SV_Semaphore_Simple.i
index f17c1097beb..e18acd95a84 100644
--- a/ace/SV_Semaphore_Simple.i
+++ b/ace/SV_Semaphore_Simple.i
@@ -5,7 +5,7 @@
 
 #include "ace/Trace.h"
 
-inline int
+ASYS_INLINE int
 ACE_SV_Semaphore_Simple::control (int cmd, 
 				  semun arg, 
 				  u_short n) const
@@ -18,7 +18,7 @@ ACE_SV_Semaphore_Simple::control (int cmd,
 // Close a ACE_SV_Semaphore, marking it as invalid for subsequent
 // operations...
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::close (void)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::close");
@@ -27,7 +27,7 @@ ACE_SV_Semaphore_Simple::close (void)
 
 // General ACE_SV_Semaphore operation on an array of SV_Semaphores. 
      
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::op");
@@ -39,21 +39,21 @@ ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const
 // decrement it by 1 and return. Dijkstra's P operation, Tannenbaums
 // DOWN operation.
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::acquire (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire");
   return this->op (-1, n, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::acquire_read (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_read");
   return this->acquire (n, flags);
 }
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_write");
@@ -62,7 +62,7 @@ ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const
 
 // Non-blocking version of acquire(). 
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire");
@@ -71,7 +71,7 @@ ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const
 
 // Non-blocking version of acquire(). 
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_read");
@@ -80,7 +80,7 @@ ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const
 
 // Non-blocking version of acquire(). 
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_write");
@@ -90,14 +90,14 @@ ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const
 // Increment ACE_SV_Semaphore by one. Dijkstra's V operation,
 // Tannenbaums UP operation.
 
-inline int 
+ASYS_INLINE int 
 ACE_SV_Semaphore_Simple::release (u_short n, int flags) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::release");
   return this->op (1, n, flags);
 }
 
-inline int
+ASYS_INLINE int
 ACE_SV_Semaphore_Simple::get_id (void) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::get_id");
diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp
index da3af168aaf..a864f4ade57 100644
--- a/ace/UPIPE_Acceptor.cpp
+++ b/ace/UPIPE_Acceptor.cpp
@@ -6,6 +6,10 @@
 
 #if defined (ACE_HAS_THREADS)
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/UPIPE_Acceptor.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor)
 
 void
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index 6c2664c3721..c3deffdda63 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -77,6 +77,9 @@ private:
   // To confirm connection establishment.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/UPIPE_Acceptor.i"
+#endif
+
 #endif /* ACE_HAS_THREADS */
 #endif /* ACE_UPIPE_ACCEPTOR_H */
diff --git a/ace/UPIPE_Acceptor.i b/ace/UPIPE_Acceptor.i
index 7a395658212..d47cf593242 100644
--- a/ace/UPIPE_Acceptor.i
+++ b/ace/UPIPE_Acceptor.i
@@ -3,7 +3,7 @@
 
 // UPIPE_Acceptor.i
 
-inline int
+ASYS_INLINE int
 ACE_UPIPE_Acceptor::remove (void)
 {
   ACE_TRACE ("ACE_UPIPE_Acceptor::remove");
diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp
index eeba0f7a8dd..00ea25cee1d 100644
--- a/ace/UPIPE_Connector.cpp
+++ b/ace/UPIPE_Connector.cpp
@@ -6,6 +6,10 @@
 
 #if defined (ACE_HAS_THREADS)
 
+#if defined (ACE_LACKS_INLINE_FUNCTIONS)
+#include "ace/UPIPE_Connector.i"
+#endif
+
 ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector)
 
 void
diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h
index 6dfdb7df9de..c5c23c1d327 100644
--- a/ace/UPIPE_Connector.h
+++ b/ace/UPIPE_Connector.h
@@ -93,6 +93,9 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/UPIPE_Connector.i"
+#endif
+
 #endif /* ACE_HAS_THREADS */
 #endif /* ACE_UPIPE_CONNECTOR_H */
diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i
index 7cf670caf04..c7f32edb985 100644
--- a/ace/UPIPE_Connector.i
+++ b/ace/UPIPE_Connector.i
@@ -5,7 +5,7 @@
 
 // Creates a Local ACE_UPIPE. 
 
-inline
+ASYS_INLINE
 ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, 
 					  const ACE_UPIPE_Addr &addr,
 					  ACE_Time_Value *timeout,
@@ -22,7 +22,7 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream,
 	       addr.get_path_name (), "ACE_UPIPE_Connector"));
 }
 
-inline int
+ASYS_INLINE int
 ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE handle)
 {
   ACE_UNUSED_ARG (handle);
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 4f487393b34..d25aaac3848 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -1,3 +1,5 @@
+// $Id$
+
 #if ! defined (ACE_CONFIG_WINCE_H)
 #define ACE_CONFIG_WINCE_H
 
@@ -7,6 +9,7 @@
 #define ACE_USES_WINCE_SEMA_SIMULATION
 #define ACE_HAS_STRICT 1
 
+#define ACE_LACKS_INLINE_FUNCTIONS
 
 // @@ Need to remap every function that uses any of these flags to
 //    Win32 API.  These are for ANSI styled function and are not