summaryrefslogtreecommitdiff
path: root/ace/config-win32-common.h
diff options
context:
space:
mode:
authorcdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-10 21:26:29 +0000
committercdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-10 21:26:29 +0000
commit8b324fcc956421b9721259e644f727ecc5214717 (patch)
tree468c5c442878223c90ff5baa77dded02ca757916 /ace/config-win32-common.h
parentd61932d5dcd44c74f3334fdb053ef2adbd7eac36 (diff)
downloadATCD-8b324fcc956421b9721259e644f727ecc5214717.tar.gz
wrapped ACE_HAS_TYPENAME_KEYWORD so it is only defined for MSVC++ 6.0 or higher
Diffstat (limited to 'ace/config-win32-common.h')
-rw-r--r--ace/config-win32-common.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 907f7ec5b44..90eef0e1498 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -55,14 +55,18 @@ typedef unsigned __int64 ACE_UINT64;
# define ACE_LACKS_PRAGMA_ONCE
#endif /* _MSC_VER < 1000 */
-// Only MSVC 5.0 definitions
+// Only >= MSVC 5.0 definitions
#if (_MSC_VER >= 1100)
#if !defined (ACE_HAS_WINCE)
#define ACE_HAS_SIG_ATOMIC_T
#endif /* ACE_HAS_WINCE */
-#define ACE_HAS_TYPENAME_KEYWORD
#endif /* _MSC_VER >= 1100 */
+// Only >= MSVC 6.0 definitions
+#if (_MSC_VER >= 1200)
+#define ACE_HAS_TYPENAME_KEYWORD
+#endif /* _MSC_VER >= 1200 */
+
// Optimize ACE_Handle_Set for select().
#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT