diff options
Diffstat (limited to 'ace/config-win32-common.h')
| -rw-r--r-- | ace/config-win32-common.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 907f7ec5b44..ddfc4a3b77b 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -153,7 +153,7 @@ typedef unsigned __int64 ACE_UINT64; // Platform support linebuffered streaming is broken #define ACE_LACKS_LINEBUFFERED_STREAMBUF -// Template specialization is supported. +// Template specialization is supported #define ACE_HAS_TEMPLATE_SPECIALIZATION // No system support for replacing any previous mappings. @@ -256,7 +256,7 @@ typedef unsigned __int64 ACE_UINT64; #endif /* _MT */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__) +#if !defined (ACE_HAS_WINCE) #if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0) #if !defined(_DLL) // *** DO NOT *** DO NOT *** defeat this error message @@ -264,7 +264,7 @@ typedef unsigned __int64 ACE_UINT64; #error You must link against (Debug) Multithreaded DLL run-time libraries. #endif /* !_DLL */ #endif /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */ -#endif /* !ACE_HAS_WINCE && !__BORLANDC__ */ +#endif /* ACE_HAS_WINCE */ // We are using STL's min and max (in algobase.h). Therefore the // macros in window.h are extra @@ -272,10 +272,6 @@ typedef unsigned __int64 ACE_UINT64; #define NOMINMAX #endif /* NOMINMAX */ -#if defined (ACE_HAS_MOSTLY_UNICODE_APIS) && !defined (UNICODE) -#defined UNICODE -#endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */ - #if defined (_UNICODE) #if !defined (UNICODE) #define UNICODE /* UNICODE is used by Windows headers */ @@ -395,10 +391,7 @@ typedef unsigned __int64 ACE_UINT64; #include /**/ <winsock.h> #endif /* _WINSOCKAPI */ - // PharLap ETS has its own winsock lib, so don't grab the one - // supplied with the OS. - #if defined (_MSC_VER) && !defined (UNDER_CE) && \ - !defined (ACE_HAS_PHARLAP) + #if defined (_MSC_VER) && !defined (UNDER_CE) #pragma comment(lib, "wsock32.lib") #endif /* _MSC_VER */ @@ -431,10 +424,9 @@ typedef unsigned __int64 ACE_UINT64; // At least for Win32 - MSVC compiler (ver. 5) #define ACE_UINT64_FORMAT_SPECIFIER "%I64u" -// Borland C++ compiler. -#include /**/ <ace/config-win32-borland.h> - -// IBM VisualAge C++ compiler. -#include /**/ <ace/config-win32-visualage.h> +/* + * Borland Compilers. + */ +#include <ace/config-win32-borland.h> #endif /* ACE_WIN32_COMMON_H */ |