diff --git a/include/msgpack/cpp_config.hpp b/include/msgpack/cpp_config.hpp
index f9cf3f3f..7bb3336a 100644
--- a/include/msgpack/cpp_config.hpp
+++ b/include/msgpack/cpp_config.hpp
@@ -24,7 +24,7 @@
   // If MSVC would support C++11 completely,
   // then 'defined(_MSC_VER)' would replace with
   // '_MSC_VER < XXXX'
-# if (__cplusplus < 201103) || defined(_MSC_VER)
+# if (__cplusplus < 201103L) || defined(_MSC_VER)
 #  define MSGPACK_USE_CPP03
 # endif
 #endif // MSGPACK_USE_CPP03
@@ -32,10 +32,10 @@
 
 
 #if defined __cplusplus
-#if __cplusplus < 201103
+#if __cplusplus < 201103L
 
 #if !defined(nullptr)
-#  if _MSC_VER < 1600 
+#  if _MSC_VER < 1600
 #    define nullptr (0)
 #  endif
 #endif
@@ -84,7 +84,7 @@ struct enable_if<false, T> {
 }  // namespace msgpack
 
 
-#else  // __cplusplus < 201103
+#else  // __cplusplus < 201103L
 
 #include <memory>
 #include <tuple>
@@ -110,7 +110,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 }  // namespace msgpack
 
 
-#endif // __cplusplus < 201103
+#endif // __cplusplus < 201103L
 
 #endif // __cplusplus
 
diff --git a/include/msgpack/versioning.hpp b/include/msgpack/versioning.hpp
index 46263525..19c2e804 100644
--- a/include/msgpack/versioning.hpp
+++ b/include/msgpack/versioning.hpp
@@ -62,16 +62,16 @@
 
 #define MSGPACK_PP_IS_NS_ENABLED(ns) MSGPACK_PP_CHECK(MSGPACK_PP_NS_ENABLED_PROBE(ns))
 
-#if __cplusplus < 201103
+#if __cplusplus < 201103L
 #define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \
     (namespace ns{}; using namespace ns; namespace ns, \
      namespace ns)
 
-#else  // __cplusplus < 201103
+#else  // __cplusplus < 201103L
 
 #define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \
     (inline namespace ns, namespace ns)
 
-#endif // __cplusplus < 201103
+#endif // __cplusplus < 201103L
 
 #endif // MSGPACK_VERSIONING_HPP
diff --git a/test/msgpack_tuple.cpp b/test/msgpack_tuple.cpp
index 9779d06a..07b431be 100644
--- a/test/msgpack_tuple.cpp
+++ b/test/msgpack_tuple.cpp
@@ -30,7 +30,7 @@ TEST(msgpack_tuple, non_member_get)
     EXPECT_EQ("DEFG", msgpack::type::get<2>(t1));
 }
 
-#if __cplusplus >= 201103
+#if __cplusplus >= 201103L
 TEST(msgpack_tuple, std_non_member_get)
 {
     msgpack::type::tuple<int, bool, std::string> t1(42, true, "ABC");