From b152aa84d52882bb1846485a89baf13aa07c86bc Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Tue, 26 Oct 2010 10:39:26 +0200 Subject: Consolidate oom_check() functions This consolidates the duplicated oom_check() functions, as well as splitting them into OS dependant versions to avoid the #ifdef grossness that was present in the old osdep.c version. Signed-off-by: Jes Sorensen Signed-off-by: Blue Swirl --- oslib-posix.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'oslib-posix.c') diff --git a/oslib-posix.c b/oslib-posix.c index ad44b17637..6e9b0c3c13 100644 --- a/oslib-posix.c +++ b/oslib-posix.c @@ -31,8 +31,7 @@ #include "trace.h" #include "qemu_socket.h" -#if !defined(_POSIX_C_SOURCE) || defined(__sun__) -static void *oom_check(void *ptr) +void *qemu_oom_check(void *ptr) { if (ptr == NULL) { fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno)); @@ -40,7 +39,6 @@ static void *oom_check(void *ptr) } return ptr; } -#endif void *qemu_memalign(size_t alignment, size_t size) { @@ -54,9 +52,9 @@ void *qemu_memalign(size_t alignment, size_t size) abort(); } #elif defined(CONFIG_BSD) - ptr = oom_check(valloc(size)); + ptr = qemu_oom_check(valloc(size)); #else - ptr = oom_check(memalign(alignment, size)); + ptr = qemu_oom_check(memalign(alignment, size)); #endif trace_qemu_memalign(alignment, size, ptr); return ptr; -- cgit v1.2.1