ChangeLogTag: Sat Aug 31 17:38:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 138 insertions, 69 deletions

diff --git a/ChangeLog b/ChangeLog
index b5d3e2cf530..81079951cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sat Aug 31 17:45:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-borland-common.h:
+          Created a new config file for the Borland compiler. This will be
+          used on the Win32 platform and the Kylix3 compiler on Linux
+
+        * ace/config-linux-common.h:
+          When the Borland compiler is detected, include the
+          config-borland-common.h file
+
+        * ace/config-win32-borland.h:
+          Moved most of the contents to the config-borland-common.h file,
+          only the lines that are Win32 specific stay here.
+
 Sat Aug 31 10:32:38 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/Future.cpp (set): Removed a stray reference to "iterator"
@@ -9,15 +23,15 @@ Sat Aug 31 01:20:09 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
 
 	* include/makeinclude/rules.nested.GNU: Rewritten by Gary Duzan.
 	  If a list of directories is specified with DIRS= for a recursive
-	  make, make will halt immediately and propagate a non-zero 
-	  return code to the shell if an error is encountered in a 
-	  subdirectory.  The present behavior does not propagate any 
-	  errors to make if there is an error in a subdirectory.  If make -k 
-	  is specified, make will keep on going even if it encounters an 
-	  error in a subdirectory, but it will also propagate a non-zero 
-	  return code to make when the make finishes.  The current behavior 
-	  is to keep on going if an error is encountered in a subdirectory, 
-	  but NOT propagate a non-zero return code upon termination of make. 
+	  make, make will halt immediately and propagate a non-zero
+	  return code to the shell if an error is encountered in a
+	  subdirectory.  The present behavior does not propagate any
+	  errors to make if there is an error in a subdirectory.  If make -k
+	  is specified, make will keep on going even if it encounters an
+	  error in a subdirectory, but it will also propagate a non-zero
+	  return code to make when the make finishes.  The current behavior
+	  is to keep on going if an error is encountered in a subdirectory,
+	  but NOT propagate a non-zero return code upon termination of make.
 
 	* ace/Makefile.dirs: (Added) Specifies the DIRS= list of directories
 	  to invoke recursive makes on.
@@ -40,8 +54,8 @@ Fri Aug 30 17:34:00 2002  Justin Michel <michel_j@ociweb.com>
         Reimplemented timer list to be compatible with Itanium. It no longer
         uses a Node* as the timer_id, so the cancel operation is now much
         more expensive. On the plus side I was able to make a few optimizations
-        that improve the speed of the schedule operations. 
-        I also made a small optimization to the timer wheel, and updated 
+        that improve the speed of the schedule operations.
+        I also made a small optimization to the timer wheel, and updated
         the test slightly.
 
 Fri Aug 30 15:53:18 2002  Steve Huston  <shuston@riverace.com>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b5d3e2cf530..81079951cc1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,17 @@
+Sat Aug 31 17:45:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-borland-common.h:
+          Created a new config file for the Borland compiler. This will be
+          used on the Win32 platform and the Kylix3 compiler on Linux
+
+        * ace/config-linux-common.h:
+          When the Borland compiler is detected, include the
+          config-borland-common.h file
+
+        * ace/config-win32-borland.h:
+          Moved most of the contents to the config-borland-common.h file,
+          only the lines that are Win32 specific stay here.
+
 Sat Aug 31 10:32:38 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/Future.cpp (set): Removed a stray reference to "iterator"
@@ -9,15 +23,15 @@ Sat Aug 31 01:20:09 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
 
 	* include/makeinclude/rules.nested.GNU: Rewritten by Gary Duzan.
 	  If a list of directories is specified with DIRS= for a recursive
-	  make, make will halt immediately and propagate a non-zero 
-	  return code to the shell if an error is encountered in a 
-	  subdirectory.  The present behavior does not propagate any 
-	  errors to make if there is an error in a subdirectory.  If make -k 
-	  is specified, make will keep on going even if it encounters an 
-	  error in a subdirectory, but it will also propagate a non-zero 
-	  return code to make when the make finishes.  The current behavior 
-	  is to keep on going if an error is encountered in a subdirectory, 
-	  but NOT propagate a non-zero return code upon termination of make. 
+	  make, make will halt immediately and propagate a non-zero
+	  return code to the shell if an error is encountered in a
+	  subdirectory.  The present behavior does not propagate any
+	  errors to make if there is an error in a subdirectory.  If make -k
+	  is specified, make will keep on going even if it encounters an
+	  error in a subdirectory, but it will also propagate a non-zero
+	  return code to make when the make finishes.  The current behavior
+	  is to keep on going if an error is encountered in a subdirectory,
+	  but NOT propagate a non-zero return code upon termination of make.
 
 	* ace/Makefile.dirs: (Added) Specifies the DIRS= list of directories
 	  to invoke recursive makes on.
@@ -40,8 +54,8 @@ Fri Aug 30 17:34:00 2002  Justin Michel <michel_j@ociweb.com>
         Reimplemented timer list to be compatible with Itanium. It no longer
         uses a Node* as the timer_id, so the cancel operation is now much
         more expensive. On the plus side I was able to make a few optimizations
-        that improve the speed of the schedule operations. 
-        I also made a small optimization to the timer wheel, and updated 
+        that improve the speed of the schedule operations.
+        I also made a small optimization to the timer wheel, and updated
         the test slightly.
 
 Fri Aug 30 15:53:18 2002  Steve Huston  <shuston@riverace.com>
diff --git a/ace/config-borland-common.h b/ace/config-borland-common.h
new file mode 100644
index 00000000000..f8f82d8cceb
--- /dev/null
+++ b/ace/config-borland-common.h
@@ -0,0 +1,79 @@
+// -*- C++ -*-
+//$Id$
+
+// The following configuration file contains defines for Borland compilers.
+
+#ifndef ACE_CONFIG_BORLAND_COMMON_H
+#define ACE_CONFIG_BORLAND_COMMON_H
+#include "ace/pre.h"
+
+# if (__BORLANDC__ == 0x540)
+// The linker in C++Builder 4 has trouble with the large number of DLL
+// function exports created when you compile without inline functions.
+// Therefore we will always use inline functions with this version of
+// the compiler.
+#  if defined (__ACE_INLINE__)
+#   undef __ACE_INLINE__
+#  endif /* __ACE_INLINE__ */
+#  define __ACE_INLINE__ 1
+# else /* __BORLANDC__ == 0x540 */
+// 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__ */
+# endif /* __BORLANDC__ == 0x540 */
+
+# define ACE_CC_NAME ACE_LIB_TEXT ("Borland C++ Builder")
+# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100)
+# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
+# define ACE_CC_BETA_VERSION (0)
+# define ACE_CC_PREPROCESSOR "CPP32.EXE"
+# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s"
+
+# define ACE_HAS_ITOA 1
+
+# define ACE_EXPORT_NESTED_CLASSES 1
+# define ACE_HAS_ANSI_CASTS 1
+# define ACE_HAS_CPLUSPLUS_HEADERS 1
+# define ACE_HAS_EXCEPTIONS 1
+# define ACE_HAS_EXPLICIT_KEYWORD 1
+# define ACE_HAS_GNU_CSTRING_H 1
+# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1
+# define ACE_HAS_MUTABLE_KEYWORD 1
+# define ACE_HAS_NONCONST_SELECT_TIMEVAL
+# define ACE_HAS_SIG_ATOMIC_T
+# define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION 1
+# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 1
+# define ACE_HAS_STDCPP_STL_INCLUDES 1
+# define ACE_HAS_STRERROR
+# define ACE_HAS_STRING_CLASS 1
+# define ACE_HAS_STRPTIME
+# define ACE_HAS_TEMPLATE_SPECIALIZATION 1
+# define ACE_HAS_TEMPLATE_TYPEDEFS 1
+# define ACE_HAS_TYPENAME_KEYWORD 1
+# define ACE_HAS_USER_MODE_MASKS 1
+# define ACE_HAS_USING_KEYWORD 1
+# define ACE_LACKS_ACE_IOSTREAM 1
+# define ACE_LACKS_INLINE_ASSEMBLY 1
+# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
+# define ACE_LACKS_NATIVE_STRPTIME 1
+# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
+# define ACE_LACKS_PRAGMA_ONCE 1
+# define ACE_LACKS_STRRECVFD
+# define ACE_NEW_THROWS_EXCEPTIONS 1
+# define ACE_SIZEOF_LONG_DOUBLE 10
+# define ACE_TEMPLATES_REQUIRE_SOURCE 1
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu")
+# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld")
+# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+# define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1
+
+# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
+
+#include "ace/post.h"
+#endif /* ACE_CONFIG_BORLAND_COMMON_H */
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 22ae814043e..e690220ec3b 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -138,7 +138,13 @@
 # include "ace/config-cxx-common.h"
 #elif defined (__INTEL_COMPILER)
 # include "ace/config-icc-common.h"
-#else  /* ! __GNUG__ && ! __KCC && !__DECCXX && !__INTEL_COMPILER*/
+#elif defined (__BORLANDC__)
+# undef ACE_HAS_LLSEEK
+# undef ACE_HAS_LSEEK64
+# undef ACE_LACKS_LLSEEK_PROTOTYPE
+# undef ACE_LACKS_LSEEK64_PROTOTYPE
+# include "ace/config-borland-common.h"
+#else  /* ! __GNUG__ && ! __KCC && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__*/
 # error unsupported compiler in ace/config-linux-common.h
 #endif /* ! __GNUG__ && ! __KCC */
 
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 347da3ccafd..df5b0604c2b 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -11,6 +11,8 @@
 #error Use config-win32.h in config.h instead of this header
 #endif /* ACE_CONFIG_WIN32_H */
 
+#include "config-borland-common.h"
+
 # if (__BORLANDC__ == 0x540)
 // The linker in C++Builder 4 has trouble with the large number of DLL
 // function exports created when you compile without inline functions.
@@ -46,58 +48,12 @@
 
 # include "ace/config-win32-common.h"
 
-# define ACE_CC_NAME ACE_LIB_TEXT ("Borland C++ Builder")
-# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100)
-# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
-# define ACE_CC_BETA_VERSION (0)
-# define ACE_CC_PREPROCESSOR "CPP32.EXE"
-# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s"
-
-# define ACE_HAS_ITOA 1
 # define ACE_STRCASECMP_EQUIVALENT ::stricmp
 # define ACE_STRNCASECMP_EQUIVALENT ::strnicmp
 # define ACE_WCSDUP_EQUIVALENT ::_wcsdup
 
-# define ACE_EXPORT_NESTED_CLASSES 1
-# define ACE_HAS_ANSI_CASTS 1
-# define ACE_HAS_CPLUSPLUS_HEADERS 1
-# define ACE_HAS_EXCEPTIONS 1
-# define ACE_HAS_EXPLICIT_KEYWORD 1
-# define ACE_HAS_GNU_CSTRING_H 1
-# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION 1
-# define ACE_HAS_MUTABLE_KEYWORD 1
-# define ACE_HAS_NONCONST_SELECT_TIMEVAL
-# define ACE_HAS_SIG_ATOMIC_T
-# define ACE_HAS_STANDARD_CPP_LIBRARY 1
-# define ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION 1
-# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 1
-# define ACE_HAS_STDCPP_STL_INCLUDES 1
-# define ACE_HAS_STRERROR
-# define ACE_HAS_STRING_CLASS 1
-# define ACE_HAS_STRPTIME
-# define ACE_HAS_TEMPLATE_SPECIALIZATION 1
-# define ACE_HAS_TEMPLATE_TYPEDEFS 1
-# define ACE_HAS_TYPENAME_KEYWORD 1
-# define ACE_HAS_USER_MODE_MASKS 1
-# define ACE_HAS_USING_KEYWORD 1
-# define ACE_LACKS_ACE_IOSTREAM 1
-# define ACE_LACKS_INLINE_ASSEMBLY 1
-# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 # define ACE_LACKS_MODE_MASKS 1
-# define ACE_LACKS_NATIVE_STRPTIME 1
-# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1
-# define ACE_LACKS_PRAGMA_ONCE 1
-# define ACE_LACKS_STRRECVFD
-# define ACE_NEW_THROWS_EXCEPTIONS 1
-# define ACE_SIZEOF_LONG_DOUBLE 10
-# define ACE_TEMPLATES_REQUIRE_SOURCE 1
-# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu")
-# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld")
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-# define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1
 # define ACE_WSTRING_HAS_USHORT_SUPPORT 1
 
-# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
-
 #include "ace/post.h"
 #endif /* ACE_CONFIG_WIN32_BORLAND_H */