generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed raw references to __sun__, __FreeBSD__, __GLIBC__ and __linux__; now just check to see if they are defined.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@177310 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2013-03-18 19:34:07 +00:00
parent dab9b2eb32
commit 53e2763966
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/__config
View File

@@ -272,7 +272,7 @@ typedef __char32_t char32_t;
#define _LIBCPP_HAS_NO_CONSTEXPR #define _LIBCPP_HAS_NO_CONSTEXPR
#endif #endif
#if __FreeBSD__ && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L) #if defined(__FreeBSD__) && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L)
#define _LIBCPP_HAS_QUICK_EXIT #define _LIBCPP_HAS_QUICK_EXIT
#define _LIBCPP_HAS_C11_FEATURES #define _LIBCPP_HAS_C11_FEATURES
#endif #endif
@@ -451,18 +451,18 @@ template <unsigned> struct __static_assert_check {};
#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; #define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
#endif #endif
#if defined(__APPLE__) || __FreeBSD__ || _WIN32 || __sun__ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
#define _LIBCPP_LOCALE__L_EXTENSIONS 1 #define _LIBCPP_LOCALE__L_EXTENSIONS 1
#endif #endif
#if __FreeBSD__ #ifdef __FreeBSD__
#define _DECLARE_C99_LDBL_MATH 1 #define _DECLARE_C99_LDBL_MATH 1
#endif #endif
#if defined(__APPLE__) || __FreeBSD__ #if defined(__APPLE__) || defined(__FreeBSD__)
#define _LIBCPP_HAS_DEFAULTRUNELOCALE #define _LIBCPP_HAS_DEFAULTRUNELOCALE
#endif #endif
#if defined(__APPLE__) || __FreeBSD__ || __sun__ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)
#define _LIBCPP_WCTYPE_IS_MASK #define _LIBCPP_WCTYPE_IS_MASK
#endif #endif

12
include/__locale
View File

@@ -21,7 +21,7 @@
#include <locale.h> #include <locale.h>
#ifdef _WIN32 #ifdef _WIN32
# include <support/win32/locale_win32.h> # include <support/win32/locale_win32.h>
#elif (__GLIBC__ || defined(__APPLE__) || __FreeBSD__ || __sun__) #elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__))
# include <xlocale.h> # include <xlocale.h>
#endif // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_ #endif // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_
@@ -315,7 +315,7 @@ locale::operator()(const basic_string<_CharT, _Traits, _Allocator>& __x,
class _LIBCPP_TYPE_VIS ctype_base class _LIBCPP_TYPE_VIS ctype_base
{ {
public: public:
#if __GLIBC__ #ifdef __GLIBC__
typedef unsigned short mask; typedef unsigned short mask;
static const mask space = _ISspace; static const mask space = _ISspace;
static const mask print = _ISprint; static const mask print = _ISprint;
@@ -339,10 +339,10 @@ public:
static const mask punct = _PUNCT; static const mask punct = _PUNCT;
static const mask xdigit = _HEX; static const mask xdigit = _HEX;
static const mask blank = _BLANK; static const mask blank = _BLANK;
#elif (__APPLE__ || __FreeBSD__) #elif (defined(__APPLE__) || defined(__FreeBSD__))
#if __APPLE__ #ifdef __APPLE__
typedef __uint32_t mask; typedef __uint32_t mask;
#elif __FreeBSD__ #elif defined(__FreeBSD__)
typedef unsigned long mask; typedef unsigned long mask;
#endif #endif
static const mask space = _CTYPE_S; static const mask space = _CTYPE_S;
@@ -355,7 +355,7 @@ public:
static const mask punct = _CTYPE_P; static const mask punct = _CTYPE_P;
static const mask xdigit = _CTYPE_X; static const mask xdigit = _CTYPE_X;
static const mask blank = _CTYPE_B; static const mask blank = _CTYPE_B;
#elif __sun__ #elif defined(__sun__)
typedef unsigned int mask; typedef unsigned int mask;
static const mask space = _ISSPACE; static const mask space = _ISSPACE;
static const mask print = _ISPRINT; static const mask print = _ISPRINT;

2
include/locale
View File

@@ -204,7 +204,7 @@ template <class charT> class messages_byname;
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if defined(__APPLE__) || __FreeBSD__ #if defined(__APPLE__) || defined(__FreeBSD__)
# define _LIBCPP_GET_C_LOCALE 0 # define _LIBCPP_GET_C_LOCALE 0
#else #else
# define _LIBCPP_GET_C_LOCALE __cloc() # define _LIBCPP_GET_C_LOCALE __cloc()

2
src/thread.cpp
View File

@@ -14,7 +14,7 @@
#include "limits" #include "limits"
#include <sys/types.h> #include <sys/types.h>
#if !defined(_WIN32) #if !defined(_WIN32)
#if !__sun__ && !__linux__ #if !defined(__sun__) && !defined(__linux__)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#else #else
#include <unistd.h> #include <unistd.h>