aboutsummaryrefslogtreecommitdiff
path: root/sources/cxx-stl/system/include/cstddef
diff options
context:
space:
mode:
Diffstat (limited to 'sources/cxx-stl/system/include/cstddef')
-rw-r--r--sources/cxx-stl/system/include/cstddef19
1 files changed, 9 insertions, 10 deletions
diff --git a/sources/cxx-stl/system/include/cstddef b/sources/cxx-stl/system/include/cstddef
index cb06b49c8..91fb7af00 100644
--- a/sources/cxx-stl/system/include/cstddef
+++ b/sources/cxx-stl/system/include/cstddef
@@ -1,4 +1,3 @@
-/* -*- c++ -*- */
/*
* Copyright (C) 2009 The Android Open Source Project
* All rights reserved.
@@ -30,21 +29,21 @@
#ifndef BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__
#define BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__
-/*
- * Standard C++ Library wrapper around the C stddef.h header file.
- * The following 2 types are also declared in the 'std' namespace:
- * . ptrdiff_t
- * . size_t
- */
#include <stddef.h>
extern "C++" {
namespace std {
+
using ::ptrdiff_t;
using ::size_t;
-} // namespace std
-} // extern C++
+#if __cplusplus >= 201103L
+typedef decltype(nullptr) nullptr_t;
+#endif
+
+}
+
+}
-#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__
+#endif