aboutsummaryrefslogtreecommitdiff
path: root/dep/ACE_wrappers/ace/config-win32-msvc.h
diff options
context:
space:
mode:
Diffstat (limited to 'dep/ACE_wrappers/ace/config-win32-msvc.h')
-rw-r--r--dep/ACE_wrappers/ace/config-win32-msvc.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/dep/ACE_wrappers/ace/config-win32-msvc.h b/dep/ACE_wrappers/ace/config-win32-msvc.h
index 7abad321c7d..738a9e2264e 100644
--- a/dep/ACE_wrappers/ace/config-win32-msvc.h
+++ b/dep/ACE_wrappers/ace/config-win32-msvc.h
@@ -12,42 +12,34 @@
* @author Darrell Brunsch <brunsch@cs.wustl.edu>
*/
//=============================================================================
-
#ifndef ACE_CONFIG_WIN32_MSVC_H
#define ACE_CONFIG_WIN32_MSVC_H
#include /**/ "ace/pre.h"
-
#ifndef ACE_CONFIG_WIN32_H
#error Use config-win32.h in config.h instead of this header
#endif /* ACE_CONFIG_WIN32_H */
-
#define ACE_CC_NAME ACE_TEXT ("Visual C++")
#ifndef ACE_USING_MCPP_PREPROCESSOR
# define ACE_CC_PREPROCESSOR "CL.EXE"
# define ACE_CC_PREPROCESSOR_ARGS "-nologo -E"
#endif
-
#define ACE_CC_MAJOR_VERSION (_MSC_VER / 100 - 6)
#define ACE_CC_MINOR_VERSION (_MSC_VER % 100)
#define ACE_CC_BETA_VERSION (0)
-
#if !defined (ACE_LD_DECORATOR_STR)
# if defined (_DEBUG)
# define ACE_LD_DECORATOR_STR ACE_TEXT ("d")
# endif /* _DEBUG */
#endif /* ACE_LD_DECORATOR_STR */
-
#if !defined(_NATIVE_WCHAR_T_DEFINED)
#define ACE_LACKS_NATIVE_WCHAR_T
#endif
-
// Win Mobile still does thread exits differently than PC Windows.
#if defined (_WIN32_WCE)
# define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS)
#else
# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
#endif /* _WIN32_WCE */
-
#if (_MSC_VER >= 1500)
# include "ace/config-win32-msvc-9.h"
#elif (_MSC_VER >= 1400)
@@ -57,7 +49,6 @@
#else
# error This version of Microsoft Visual C++ is not supported.
#endif
-
// MFC changes the behavior of operator new at all MSVC versions from 6 up
// by throwing a static CMemoryException* instead of std::bad_alloc
// (see ace/OS_Memory.h). This MFC exception object needs to be cleaned up
@@ -75,7 +66,6 @@
# endif
# define ACE_del_bad_alloc e->Delete();
#endif /* ACE_HAS_MFC && ACE_HAS_MFC==1 */
-
#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
// must have _MT defined to include multithreading
// features from win32 headers
@@ -87,13 +77,11 @@
# error You must link against multi-threaded libraries when using ACE (check your project settings)
# endif /* !_MT && !ACE_HAS_WINCE */
#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
-
#include <malloc.h>
// Although ACE does have alloca() on this compiler/platform combination, it is
// disabled by default since it can be dangerous. Uncomment the following line
// if you ACE to use it.
//#define ACE_HAS_ALLOCA 1
-
#define ACE_LACKS_DIRENT_H
#define ACE_LACKS_DLFCN_H
#define ACE_LACKS_INTTYPES_H
@@ -113,7 +101,6 @@
#define ACE_LACKS_SYS_UIO_H
#define ACE_LACKS_SYS_WAIT_H
#define ACE_LACKS_UCONTEXT_H
-
#define ACE_LACKS_SEMAPHORE_H
#define ACE_LACKS_STRINGS_H
#define ACE_LACKS_PWD_H
@@ -123,17 +110,13 @@
#define ACE_LACKS_NETINET_TCP_H
#define ACE_LACKS_TERMIOS_H
#define ACE_LACKS_REGEX_H
-
#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d")
#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u")
-
#define ACE_STRTOULL_EQUIVALENT ::_strtoui64
#define ACE_WCSTOOULL_EQUIVALENT ::_wcstoui64
-
// Turn off warnings for /W4
// To resume any of these warning: #pragma warning(default: 4xxx)
// which should be placed after these defines
-
#if !defined (ALL_WARNINGS) && defined(_MSC_VER) && !defined(ghs) && !defined(__MINGW32__)
# pragma warning(disable: 4127) /* constant expression for TRACE/ASSERT */
# pragma warning(disable: 4134) /* message map member fxn casts */
@@ -153,7 +136,6 @@
# pragma warning(disable: 1738)
# endif
#endif /* !ALL_WARNINGS && _MSV_VER && !ghs && !__MINGW32__ */
-
// STRICT type checking in WINDOWS.H enhances type safety for Windows
// programs by using distinct types to represent all the different
// HANDLES in Windows. So for example, STRICT prevents you from
@@ -164,7 +146,6 @@
# define STRICT
# endif /* !STRICT */
# endif /* ACE_HAS_STRICT */
-
#include /**/ "ace/post.h"
#endif /* ACE_CONFIG_WIN32_MSVC_H */