diff options
Diffstat (limited to 'dep/acelite/ace/config-win32.h')
| -rw-r--r-- | dep/acelite/ace/config-win32.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/dep/acelite/ace/config-win32.h b/dep/acelite/ace/config-win32.h index 89d8d68bc65..3f8caefb6a4 100644 --- a/dep/acelite/ace/config-win32.h +++ b/dep/acelite/ace/config-win32.h @@ -3,7 +3,7 @@ /** * @file config-win32.h * - * $Id: config-win32.h 92120 2010-10-01 12:00:01Z johnnyw $ + * $Id: config-win32.h 94388 2011-08-10 17:14:40Z johnnyw $ * * @brief Microsoft Windows configuration file. * @@ -22,18 +22,10 @@ // NOTE: Please do not add anything besides #include's here. Put other stuff // (definitions, etc.) in the included headers -// 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 "ace/config-win32-common.h" // Include the config-win32-* file specific to the compiler -#if defined (__BORLANDC__) -# include "ace/config-win32-borland.h" -#elif defined (_MSC_VER) +#if 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" @@ -45,9 +37,6 @@ # error Compiler is not supported #endif -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_H */ |