From: Kristian Høgsberg Date: Fri, 11 Oct 2013 02:21:05 +0000 (-0700) Subject: multi-resource: Don't include non-existing xmalloc.h X-Git-Tag: 1.3.1~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cab9aeaff5e9a73f37f9895d67a63864803a4dd6;p=platform%2Fupstream%2Fweston.git multi-resource: Don't include non-existing xmalloc.h It existed on my local disk, of course. Just copy over xzmalloc(). --- diff --git a/clients/multi-resource.c b/clients/multi-resource.c index fda9e7d..c4a0c18 100644 --- a/clients/multi-resource.c +++ b/clients/multi-resource.c @@ -39,7 +39,6 @@ #include #include "../shared/os-compatibility.h" -#include "xmalloc.h" struct device { enum { KEYBOARD, POINTER } type; @@ -82,6 +81,20 @@ static const struct wl_buffer_listener buffer_listener = { buffer_release }; +static inline void * +xzalloc(size_t s) +{ + void *p; + + p = calloc(1, s); + if (p == NULL) { + fprintf(stderr, "%s: out of memory\n", program_invocation_short_name); + exit(EXIT_FAILURE); + } + + return p; +} + static int attach_buffer(struct window *window, int width, int height) {