Preparations for removing __BEOS__ from the compiler defines.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28305 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
# include <new>
|
||||
# define __THROW_BAD_ALLOC throw bad_alloc()
|
||||
#elif !defined(__THROW_BAD_ALLOC)
|
||||
#if __BEOS__
|
||||
#if (defined(__BEOS__) || defined(__HAIKU__))
|
||||
# include <stdio.h>
|
||||
# define __THROW_BAD_ALLOC fprintf(stderr, "out of memory\n"); exit(1)
|
||||
#else
|
||||
@@ -329,7 +329,7 @@ private:
|
||||
// instead of enum { x = N }, but few compilers accept the former.
|
||||
# ifndef __SUNPRO_CC
|
||||
enum {_ALIGN = 8};
|
||||
# if defined __BEOS__
|
||||
# if (defined(__BEOS__) || defined(__HAIKU__))
|
||||
enum {_MAX_BYTES = 0};
|
||||
# else
|
||||
enum {_MAX_BYTES = 128};
|
||||
@@ -710,7 +710,7 @@ template <bool __threads, int __inst>
|
||||
__default_alloc_template<__threads, __inst>::_Obj* __VOLATILE
|
||||
__default_alloc_template<__threads, __inst> ::_S_free_list[
|
||||
_NFREELISTS
|
||||
#if defined __BEOS__
|
||||
#if (defined(__BEOS__) || defined(__HAIKU__))
|
||||
] = { };
|
||||
#else
|
||||
] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
|
||||
|
||||
Reference in New Issue
Block a user