Commit ecbdcfd3 authored by Pekka Paalanen's avatar Pekka Paalanen

Rename zalloc.h to libweston/zalloc.h

It is a public installed header used by libweston.h.

See "Rename compositor.h to libweston/libweston.h" for rationale.
Signed-off-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.com>
parent 91b1010d
......@@ -46,7 +46,7 @@
#include <libweston/config-parser.h>
#include "shared/helpers.h"
#include "shared/xalloc.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "shared/file-util.h"
#include "weston-desktop-shell-client-protocol.h"
......
......@@ -36,7 +36,7 @@
#include <wayland-client.h>
#include "window.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
struct fs_output {
struct wl_list link;
......
......@@ -42,7 +42,7 @@
#include "shared/helpers.h"
#include "shared/os-compatibility.h"
#include "shared/xalloc.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "shared/file-util.h"
#include "ivi-application-client-protocol.h"
#include "ivi-hmi-controller-client-protocol.h"
......
......@@ -132,7 +132,7 @@ foreach t : simple_clients
executable(
t_name, t.get('sources'),
include_directories: include_directories('..'),
include_directories: [ include_directories('..'), public_inc ],
dependencies: t_deps,
install: true
)
......@@ -215,7 +215,7 @@ foreach t : tools_list
executable(
'weston-@0@'.format(t.get('name')),
t.get('sources'),
include_directories: include_directories('..', '../shared'),
include_directories: [ include_directories('..', '../shared'), public_inc ],
dependencies: t.get('deps', []),
install: true
)
......@@ -328,7 +328,7 @@ if simple_dmabuf_drm_deps.length() > 0
fullscreen_shell_unstable_v1_protocol_c,
linux_dmabuf_unstable_v1_client_protocol_h,
linux_dmabuf_unstable_v1_protocol_c,
include_directories: include_directories('..'),
include_directories: [ include_directories('..'), public_inc ],
dependencies: [
dep_wayland_client,
dep_libdrm,
......
......@@ -42,7 +42,7 @@
#include <wayland-client.h>
#include "shared/os-compatibility.h"
#include "shared/xalloc.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
struct device {
enum { KEYBOARD, POINTER } type;
......
......@@ -38,7 +38,7 @@
#include <wayland-client.h>
#include "shared/helpers.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "shared/timespec-util.h"
#include "shared/os-compatibility.h"
#include "presentation-time-client-protocol.h"
......
......@@ -38,7 +38,7 @@
#include <wayland-client.h>
#include "shared/os-compatibility.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "viewporter-client-protocol.h"
......
......@@ -56,7 +56,7 @@
#include <drm_fourcc.h>
#include <wayland-client.h>
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
......
......@@ -46,7 +46,7 @@
#include <wayland-client.h>
#include "shared/helpers.h"
#include "shared/platform.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-unstable-v6-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
......
......@@ -46,7 +46,7 @@
#include <linux/input.h>
#include <wayland-client.h>
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
......
......@@ -36,7 +36,7 @@
#include <wayland-client.h>
#include "shared/os-compatibility.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h"
......
......@@ -43,7 +43,7 @@
#include "shared/helpers.h"
#include "shared/xalloc.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "window.h"
#if 0
......
......@@ -42,7 +42,7 @@
#include <wayland-client.h>
#include "shared/helpers.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "weston-debug-client-protocol.h"
struct debug_app {
......
......@@ -38,7 +38,7 @@
#include "shared/helpers.h"
#include "shared/os-compatibility.h"
#include "shared/xalloc.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "presentation-time-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "tablet-unstable-v2-client-protocol.h"
......
......@@ -73,7 +73,7 @@ typedef void *EGLContext;
#include "shared/cairo-util.h"
#include "shared/helpers.h"
#include "shared/xalloc.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h"
#include "text-cursor-position-client-protocol.h"
#include "pointer-constraints-unstable-v1-client-protocol.h"
......
......@@ -32,7 +32,7 @@
#include <wayland-client.h>
#include <cairo.h>
#include <libweston/config-parser.h>
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "shared/platform.h"
struct window;
......
......@@ -32,7 +32,7 @@
#include "shared/helpers.h"
#include "shared/string-helpers.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include <libweston/libweston.h>
#include "weston.h"
......
......@@ -43,7 +43,7 @@ extern "C" {
#include <libweston/matrix.h>
#include <libweston/config-parser.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include <libweston/timeline-object.h>
struct weston_geometry {
......
......@@ -5,6 +5,7 @@ install_headers(
'plugin-registry.h',
'timeline-object.h',
'windowed-output-api.h',
'zalloc.h',
subdir: dir_include_libweston_install
)
......
......@@ -26,7 +26,7 @@
#include <wayland-server.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "libweston-desktop.h"
#include "internal.h"
......
......@@ -29,7 +29,7 @@
#include <assert.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "helpers.h"
#include "libweston-desktop.h"
......
......@@ -31,7 +31,7 @@
#include <wayland-server.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "libweston-desktop.h"
#include "internal.h"
......
......@@ -29,7 +29,7 @@
#include <wayland-server.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "libweston-desktop.h"
#include "internal.h"
......
......@@ -31,7 +31,7 @@
#include <wayland-server.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "libweston-desktop.h"
#include "internal.h"
......
......@@ -32,7 +32,7 @@
#include <wayland-server.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-unstable-v6-server-protocol.h"
#include "libweston-desktop.h"
......
......@@ -32,7 +32,7 @@
#include <wayland-server.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "xdg-shell-server-protocol.h"
#include "libweston-desktop.h"
......
......@@ -31,7 +31,7 @@
#include <wayland-server.h>
#include <libweston/libweston.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
#include "libweston-desktop.h"
#include "internal.h"
......
......@@ -56,11 +56,6 @@ srcs_libweston = [
weston_debug_server_protocol_h,
]
install_headers(
'../shared/zalloc.h',
subdir: dir_include_libweston
)
if get_option('renderer-gl')
dep_egl = dependency('egl', required: false)
if not dep_egl.found()
......
......@@ -31,7 +31,7 @@
#include "shared/helpers.h"
#include "shared/string-helpers.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "shared/timespec-util.h"
#include <libweston/libweston.h>
......
......@@ -34,7 +34,7 @@ extern "C" {
#include <stdlib.h>
#include <string.h>
#include "zalloc.h"
#include <libweston/zalloc.h>
void *
fail_on_null(void *p, size_t size, char *file, int32_t line);
......
......@@ -33,7 +33,7 @@
#include "input-timestamps-helper.h"
#include "input-timestamps-unstable-v1-client-protocol.h"
#include "shared/timespec-util.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "weston-test-client-helper.h"
struct input_timestamps {
......
......@@ -221,7 +221,7 @@ if get_option('shell-ivi')
weston_test_protocol_c,
ivi_application_client_protocol_h,
ivi_application_protocol_c,
include_directories: include_directories('..', '../shared'),
include_directories: [ include_directories('..', '../shared'), public_inc ],
dependencies: dep_test_client,
install: false
)
......@@ -261,7 +261,7 @@ foreach t : tests_standalone
srcs_t,
c_args: [ '-DUNIT_TEST' ],
build_by_default: true,
include_directories: include_directories('..', '../shared', '../libweston'),
include_directories: [ include_directories('..', '../shared', '../libweston'), public_inc ],
dependencies: deps_t,
install: false,
)
......@@ -325,8 +325,10 @@ foreach t : tests_weston
'test-@0@'.format(t.get(0)),
srcs_t,
c_args: [ '-DUNIT_TEST' ],
include_directories:
include_directories: [
include_directories('..', '../shared'),
public_inc,
],
dependencies: deps_t,
install: false,
)
......
......@@ -36,7 +36,7 @@
#include "shared/os-compatibility.h"
#include "shared/xalloc.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "weston-test-client-helper.h"
#define max(a, b) (((a) > (b)) ? (a) : (b))
......
......@@ -37,7 +37,7 @@
#include "zuc_event_listener.h"
#include "zuc_types.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
/* a few sequences for rudimentary ANSI graphics. */
#define CSI_GRN "\x1b[0;32m"
......
......@@ -32,7 +32,7 @@
#include <string.h>
#include <unistd.h>
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
#include "zuc_event_listener.h"
#include "zunitc/zunitc_impl.h"
......
......@@ -42,7 +42,7 @@
#include "zuc_event_listener.h"
#include "zuc_types.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
/**
* Hardcoded output name.
......@@ -460,7 +460,6 @@ zuc_junit_reporter_create(void)
#else /* ENABLE_JUNIT_XML */
#include "shared/zalloc.h"
#include "zuc_event_listener.h"
/*
......
......@@ -48,7 +48,7 @@
#include <libweston/config-parser.h>
#include "shared/helpers.h"
#include "shared/zalloc.h"
#include <libweston/zalloc.h>
/*
* If CLOCK_MONOTONIC is present on the system it will give us reliable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment