Factor ELAST configuration out into src/config_elast.h. Use _WIN32 instead of __MINGW32__ since this is true for MSVC as well.
http://reviews.llvm.org/D6558 Files: include/__config src/config_elast.h src/ios.cpp src/system_error.cpp EMAIL PREFERENCES http://reviews.llvm.org/settings/panel/emailpreferences/
Index: include/__config =================================================================== --- include/__config +++ include/__config @@ -21,7 +21,6 @@ #if !_WIN32 #include <unistd.h> -#include <errno.h> // for ELAST on FreeBSD #endif #define _LIBCPP_VERSION 1101 @@ -643,21 +642,6 @@ #define _LIBCPP_WCTYPE_IS_MASK #endif -#if defined(ELAST) -#define _LIBCPP_ELAST ELAST -#elif defined(__linux__) -#define _LIBCPP_ELAST 4095 -#elif defined(_NEWLIB_VERSION) -#define _LIBCPP_ELAST __ELASTERROR -#elif defined(__APPLE__) -// Not _LIBCPP_ELAST needed on Apple -#elif defined(__sun__) -#define _LIBCPP_ELAST ESTALE -#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 - #ifndef _LIBCPP_TRIVIAL_PAIR_COPY_CTOR # define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 1 #endif Index: src/config_elast.h =================================================================== --- /dev/null +++ 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 Index: src/ios.cpp =================================================================== --- src/ios.cpp +++ src/ios.cpp @@ -7,17 +7,20 @@ // //===----------------------------------------------------------------------===// -#include "__config" #include "ios" -#include "streambuf" -#include "istream" -#include "string" + +#include <stdlib.h> + +#include "__config" #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 Index: src/system_error.cpp =================================================================== --- src/system_error.cpp +++ src/system_error.cpp @@ -8,10 +8,12 @@ //===----------------------------------------------------------------------===// #define _LIBCPP_BUILDING_SYSTEM_ERROR -#include "__config" #include "system_error" -#include "string" + +#include "__config" +#include "config_elast.h" #include "cstring" +#include "string" _LIBCPP_BEGIN_NAMESPACE_STD
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
