summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/config_elast.h36
-rw-r--r--libcxx/src/ios.cpp14
-rw-r--r--libcxx/src/system_error.cpp7
3 files changed, 50 insertions, 7 deletions
diff --git a/libcxx/src/config_elast.h b/libcxx/src/config_elast.h
new file mode 100644
index 00000000000..08d0103e8b8
--- /dev/null
+++ b/libcxx/src/config_elast.h
@@ -0,0 +1,36 @@
+//===----------------------- config_elast.h -------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP_CONFIG_ELAST
+#define _LIBCPP_CONFIG_ELAST
+
+#if defined(_WIN32)
+#include <stdlib.h>
+#else
+#include <errno.h>
+#endif
+
+#if defined(ELAST)
+#define _LIBCPP_ELAST ELAST
+#elif defined(_NEWLIB_VERSION)
+#define _LIBCPP_ELAST __ELASTERROR
+#elif defined(__linux__)
+#define _LIBCPP_ELAST 4095
+#elif defined(__APPLE__)
+// No _LIBCPP_ELAST needed on Apple
+#elif defined(__sun__)
+#define _LIBCPP_ELAST ESTALE
+#elif defined(_WIN32)
+#define _LIBCPP_ELAST _sys_nerr
+#else
+// Warn here so that the person doing the libcxx port has an easier time:
+#warning This platform's ELAST hasn't been ported yet
+#endif
+
+#endif // _LIBCPP_CONFIG_ELAST
diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp
index d879beb3801..90972c407d7 100644
--- a/libcxx/src/ios.cpp
+++ b/libcxx/src/ios.cpp
@@ -8,16 +8,20 @@
//===----------------------------------------------------------------------===//
#include "__config"
+
#include "ios"
-#include "streambuf"
-#include "istream"
-#include "string"
+
+#include <stdlib.h>
+
#include "__locale"
#include "algorithm"
+#include "config_elast.h"
+#include "istream"
+#include "limits"
#include "memory"
#include "new"
-#include "limits"
-#include <stdlib.h>
+#include "streambuf"
+#include "string"
_LIBCPP_BEGIN_NAMESPACE_STD
diff --git a/libcxx/src/system_error.cpp b/libcxx/src/system_error.cpp
index 9c8adc4f323..c032fc07b38 100644
--- a/libcxx/src/system_error.cpp
+++ b/libcxx/src/system_error.cpp
@@ -7,11 +7,14 @@
//
//===----------------------------------------------------------------------===//
-#define _LIBCPP_BUILDING_SYSTEM_ERROR
#include "__config"
+
+#define _LIBCPP_BUILDING_SYSTEM_ERROR
#include "system_error"
-#include "string"
+
+#include "config_elast.h"
#include "cstring"
+#include "string"
_LIBCPP_BEGIN_NAMESPACE_STD
OpenPOWER on IntegriCloud