diff --git a/libc/bionic/malloc_debug_common.h b/libc/bionic/malloc_debug_common.h index a0f9972dd..fb2f03d06 100644 --- a/libc/bionic/malloc_debug_common.h +++ b/libc/bionic/malloc_debug_common.h @@ -37,6 +37,7 @@ #include #include +#include "private/bionic_config.h" #include "private/libc_logging.h" #define HASHTABLE_SIZE 1543 @@ -61,12 +62,6 @@ #define Malloc(function) dl ## function #endif -// valloc(3) and pvalloc(3) were removed from POSIX 2004. We do not include them -// for LP64, but the symbols remain in LP32 for binary compatibility. -#ifndef __LP64__ -#define HAVE_DEPRECATED_MALLOC_FUNCS 1 -#endif - // ============================================================================= // Structures // ============================================================================= diff --git a/libc/private/bionic_config.h b/libc/private/bionic_config.h new file mode 100644 index 000000000..0c9811c0f --- /dev/null +++ b/libc/private/bionic_config.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _BIONIC_CONFIG_H_ +#define _BIONIC_CONFIG_H_ + +// valloc(3) and pvalloc(3) were removed from POSIX 2004. We do not include them +// for LP64, but the symbols remain in LP32 for binary compatibility. +#if !defined(__LP64__) +#define HAVE_DEPRECATED_MALLOC_FUNCS 1 +#endif + +#endif // _BIONIC_CONFIG_H_ diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp index d70136496..6b7a28b1c 100644 --- a/tests/malloc_test.cpp +++ b/tests/malloc_test.cpp @@ -22,9 +22,7 @@ #include #include -#if defined(__BIONIC__) -#include -#endif +#include "private/bionic_config.h" TEST(malloc, malloc_std) { // Simple malloc test.