diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-04-25 06:21:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-04-25 06:21:32 +0000 |
| commit | 09ad27251238b65b1f4822fc9b0c6ff6db262ba0 (patch) | |
| tree | 5609b1659d89d9065faa6eeed6077254ef26d473 | |
| parent | 1b0be34fae7e78d821fa69d3df966c8b26eabca2 (diff) | |
| download | ATCD-09ad27251238b65b1f4822fc9b0c6ff6db262ba0.tar.gz | |
ChangeLogTag: Fri Apr 25 06:17:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ace/config-borland-common.h | 1 | ||||
| -rw-r--r-- | ace/config-win32-borland.h | 22 |
3 files changed, 10 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index 101c80b0ecf..eaef82489f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Apr 25 06:18:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-borland.h: + * ace/config-borland-common.h: + Cleanup of duplicate stuff. Moved ACE_CC_PREPROCESSOR to + win32 file. + Thu Apr 24 23:20:16 2003 Venkita Subramonian <venkita@cs.wustl.edu> * Kokyu/DSRT_Dispatcher_Impl.cpp: @@ -14,7 +21,7 @@ Thu Apr 24 23:20:16 2003 Venkita Subramonian <venkita@cs.wustl.edu> Made the importance value continuous instead of discrete to make it more compatible with DSRT MIF scheduler. Made the MIF scheduler accept max and min importance thru the svc.conf file. - + Thu Apr 24 20:17:44 2003 Venkita Subramonian <venkita@cs.wustl.edu> * Kokyu/DSRT_Dispatcher_Impl.cpp: diff --git a/ace/config-borland-common.h b/ace/config-borland-common.h index db0fe42d605..a27b1d53a40 100644 --- a/ace/config-borland-common.h +++ b/ace/config-borland-common.h @@ -39,7 +39,6 @@ # 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_EXPORT_NESTED_CLASSES 1 diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index efe68d731bd..abc98ff66b2 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -13,26 +13,6 @@ #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. -// 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 */ - // Automatically define WIN32 macro if the compiler tells us it is our // target platform. # if defined (__WIN32__) && !defined (WIN32) @@ -46,6 +26,8 @@ # include /**/ <vcl.h> # endif +# define ACE_CC_PREPROCESSOR "CPP32.EXE" + # include "ace/config-win32-common.h" # define ACE_STRCASECMP_EQUIVALENT ::stricmp |