2 files changed, 10 insertions, 15 deletions
diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h
index fa9b00afeb6..9dd2a73911c 100644
--- a/ACE/ace/config-kfreebsd.h
+++ b/ACE/ace/config-kfreebsd.h
@@ -407,7 +407,6 @@
 # endif
 #endif
 
-
 /* Enable ACE inlining */
 #define __ACE_INLINE__ 1
 
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 59e6b394a86..af8d172abc5 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -6,7 +6,7 @@
 #include /**/ "ace/pre.h"
 
 #ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
+# error Use config-win32.h in config.h instead of this header
 #endif /* ACE_CONFIG_WIN32_H */
 
 #define ACE_HAS_CUSTOM_EXPORT_MACROS 1
@@ -17,19 +17,15 @@
 #define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T
 #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE <CLASS, LOCK>;
 
-// In later versions of C++Builder we will prefer inline functions by
-// default. The debug configuration of ACE is built with functions
-// out-of-line, so when linking your application against a debug ACE
-// build, you can choose to use the out-of-line functions by adding
-// ACE_NO_INLINE=1 to your project settings.
-# if !defined (__ACE_INLINE__)
-#  define __ACE_INLINE__ 1
-# endif /* __ACE_INLINE__ */
-
-# define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder")
-# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100)
-# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
-# define ACE_CC_BETA_VERSION (0)
+// Default to no inlining
+#if !defined (__ACE_INLINE__)
+# define __ACE_INLINE__ 0
+#endif /* __ACE_INLINE__ */
+
+#define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder")
+#define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100)
+#define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
+#define ACE_CC_BETA_VERSION (0)
 
 #if (__BORLANDC__ >= 0x620)
 # define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s"