diff options
Diffstat (limited to 'ACE/ace/config-win32.h')
| -rw-r--r-- | ACE/ace/config-win32.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h index 1ada8467838..3217c2b7894 100644 --- a/ACE/ace/config-win32.h +++ b/ACE/ace/config-win32.h @@ -3,8 +3,6 @@ /** * @file config-win32.h * - * $Id$ - * * @brief Microsoft Windows configuration file. * * This file is the ACE configuration file for all of Microsoft Windows @@ -22,23 +20,31 @@ // NOTE: Please do not add anything besides #include's here. Put other stuff // (definitions, etc.) in the included headers -#include "ace/config-win32-common.h" +// We need to ensure that for Borland vcl.h can be included before +// windows.h. So we will not include config-win32-common.h from here, +// but instead let it be included at the appropriate place in +// config-win32-borland.h. +#if !defined (__BORLANDC__) +# include "ace/config-win32-common.h" +#endif /* !__BORLANDC__ */ // Include the config-win32-* file specific to the compiler -#if defined (_MSC_VER) -# include "ace/config-win32-msvc.h" +#if defined (__BORLANDC__) +# include "ace/config-win32-borland.h" +#elif defined (_MSC_VER) +# include "ace/config-win32-msvc.h" #elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32 -# include "ace/config-win32-cegcc.h" +# include "ace/config-win32-cegcc.h" #elif defined (__MINGW32__) -# if defined (__MINGW64_VERSION_MAJOR) -# include "ace/config-win32-mingw64.h" -# else -# include "ace/config-win32-mingw.h" -# endif +# if defined (__MINGW64_VERSION_MAJOR) +# include "ace/config-win32-mingw64.h" +# else +# include "ace/config-win32-mingw.h" +# endif #elif defined (__DMC__) -# include "ace/config-win32-dmc.h" +# include "ace/config-win32-dmc.h" #else -# error Compiler is not supported +# error Compiler is not supported #endif #include /**/ "ace/post.h" |