diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-11 10:55:23 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-11 10:55:23 +0000 |
| commit | 1466d9088def2b6dc7a13dbd058b45df44e4c7fa (patch) | |
| tree | a1a23db71ef86f2e3f70846aac601337ef4df68a /ace/config-win32-msvc.h | |
| parent | cf3d4390e290217bc6cdbbfcb4422e6af6ce2f62 (diff) | |
| download | ATCD-1466d9088def2b6dc7a13dbd058b45df44e4c7fa.tar.gz | |
ChangeLogTag: Fri Mar 11 10:54:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/config-win32-msvc.h')
| -rw-r--r-- | ace/config-win32-msvc.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h index bb319cef13e..f2bcce0e2ef 100644 --- a/ace/config-win32-msvc.h +++ b/ace/config-win32-msvc.h @@ -29,22 +29,19 @@ #define ACE_CC_MINOR_VERSION (_MSC_VER % 100) #define ACE_CC_BETA_VERSION (0) -// Support "decorated" library names for MSVC 6 or better. -#if (_MSC_VER >= 1200) -# if !defined (ACE_LD_DECORATOR_STR) -# if defined (_DEBUG) -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfcd") -# else -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") -# endif /* ACE_HAS_MFC */ -# else /* _NDEBUG */ -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfc") -# endif /* ACE_HAS_MFC */ -# endif /* _DEBUG */ -# endif /* ACE_LD_DECORATOR_STR */ -#endif /* _MSC_VER >= 1200 */ +#if !defined (ACE_LD_DECORATOR_STR) +# if defined (_DEBUG) +# if ACE_HAS_MFC == 1 +# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfcd") +# else +# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") +# endif /* ACE_HAS_MFC */ +# else /* _NDEBUG */ +# if ACE_HAS_MFC == 1 +# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfc") +# endif /* ACE_HAS_MFC */ +# endif /* _DEBUG */ +#endif /* ACE_LD_DECORATOR_STR */ // Compiler sets _CPPRTTI if rtti is enabled. #if defined (_CPPRTTI) @@ -61,6 +58,7 @@ # include "ace/config-win32-msvc-8.h" #elif (_MSC_VER >= 1300) # include "ace/config-win32-msvc-7.h" +// FUZZ: disable check_for_msc_ver #elif (_MSC_VER >= 1200) # include "ace/config-win32-msvc-6.h" #else |