mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename zalloc.h to libweston/zalloc.h

Browse Source 
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 <pekka.paalanen@collabora.com>
dev
Pekka Paalanen 6 years ago
parent 91b1010de9
commit ecbdcfd373
38 changed files with 42 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      clients/desktop-shell.c
  2. 2
      clients/fullscreen.c
  3. 2
      clients/ivi-shell-user-interface.c
  4. 6
      clients/meson.build
  5. 2
      clients/multi-resource.c
  6. 2
      clients/presentation-shm.c
  7. 2
      clients/simple-damage.c
  8. 2
      clients/simple-dmabuf-drm.c
  9. 2
      clients/simple-dmabuf-egl.c
  10. 2
      clients/simple-dmabuf-v4l.c
  11. 2
      clients/simple-shm.c
  12. 2
      clients/subsurfaces.c
  13. 2
      clients/weston-debug.c
  14. 2
      clients/weston-info.c
  15. 2
      clients/window.c
  16. 2
      clients/window.h
  17. 2
      compositor/systemd-notify.c
  18. 2
      include/libweston/libweston.h
  19. 1
      include/libweston/meson.build
  20. 0
      include/libweston/zalloc.h
  21. 2
      libweston-desktop/client.c
  22. 2
      libweston-desktop/libweston-desktop.c
  23. 2
      libweston-desktop/seat.c
  24. 2
      libweston-desktop/surface.c
  25. 2
      libweston-desktop/wl-shell.c
  26. 2
      libweston-desktop/xdg-shell-v6.c
  27. 2
      libweston-desktop/xdg-shell.c
  28. 2
      libweston-desktop/xwayland.c
  29. 5
      libweston/meson.build
  30. 2
      libweston/touch-calibration.c
  31. 2
      shared/xalloc.h
  32. 2
      tests/input-timestamps-helper.c
  33. 8
      tests/meson.build
  34. 2
      tests/weston-test-client-helper.c
  35. 2
      tools/zunitc/src/zuc_base_logger.c
  36. 2
      tools/zunitc/src/zuc_collector.c
  37. 3
      tools/zunitc/src/zuc_junit_reporter.c
  38. 2
      tools/zunitc/src/zunitc_impl.c

2
clients/desktop-shell.c
Unescape View File

@ -46,7 +46,7 @@
#include <libweston/config-parser.h> #include <libweston/config-parser.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "shared/file-util.h" #include "shared/file-util.h"
#include "weston-desktop-shell-client-protocol.h" #include "weston-desktop-shell-client-protocol.h"

2
clients/fullscreen.c
Unescape View File

@ -36,7 +36,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "window.h" #include "window.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
struct fs_output { struct fs_output {
struct wl_list link; struct wl_list link;

2
clients/ivi-shell-user-interface.c
Unescape View File

@ -42,7 +42,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "shared/file-util.h" #include "shared/file-util.h"
#include "ivi-application-client-protocol.h" #include "ivi-application-client-protocol.h"
#include "ivi-hmi-controller-client-protocol.h" #include "ivi-hmi-controller-client-protocol.h"

6
clients/meson.build
Unescape View File

@ -132,7 +132,7 @@ foreach t : simple_clients
executable( executable(
t_name, t.get('sources'), t_name, t.get('sources'),
include_directories: include_directories('..'), include_directories: [ include_directories('..'), public_inc ],
dependencies: t_deps, dependencies: t_deps,
install: true install: true
) )
@ -215,7 +215,7 @@ foreach t : tools_list
executable( executable(
'weston-@0@'.format(t.get('name')), 'weston-@0@'.format(t.get('name')),
t.get('sources'), t.get('sources'),
include_directories: include_directories('..', '../shared'), include_directories: [ include_directories('..', '../shared'), public_inc ],
dependencies: t.get('deps', []), dependencies: t.get('deps', []),
install: true install: true
) )
@ -328,7 +328,7 @@ if simple_dmabuf_drm_deps.length() > 0
fullscreen_shell_unstable_v1_protocol_c, fullscreen_shell_unstable_v1_protocol_c,
linux_dmabuf_unstable_v1_client_protocol_h, linux_dmabuf_unstable_v1_client_protocol_h,
linux_dmabuf_unstable_v1_protocol_c, linux_dmabuf_unstable_v1_protocol_c,
include_directories: include_directories('..'), include_directories: [ include_directories('..'), public_inc ],
dependencies: [ dependencies: [
dep_wayland_client, dep_wayland_client,
dep_libdrm, dep_libdrm,

2
clients/multi-resource.c
Unescape View File

@ -42,7 +42,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
struct device { struct device {
enum { KEYBOARD, POINTER } type; enum { KEYBOARD, POINTER } type;

2
clients/presentation-shm.c
Unescape View File

@ -38,7 +38,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "presentation-time-client-protocol.h" #include "presentation-time-client-protocol.h"

2
clients/simple-damage.c
Unescape View File

@ -38,7 +38,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "viewporter-client-protocol.h" #include "viewporter-client-protocol.h"

2
clients/simple-dmabuf-drm.c
Unescape View File

@ -56,7 +56,7 @@
#include <drm_fourcc.h> #include <drm_fourcc.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h"

2
clients/simple-dmabuf-egl.c
Unescape View File

@ -46,7 +46,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/platform.h" #include "shared/platform.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-unstable-v6-client-protocol.h" #include "xdg-shell-unstable-v6-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h"

2
clients/simple-dmabuf-v4l.c
Unescape View File

@ -46,7 +46,7 @@
#include <linux/input.h> #include <linux/input.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h"

2
clients/simple-shm.c
Unescape View File

@ -36,7 +36,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "fullscreen-shell-unstable-v1-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h"

2
clients/subsurfaces.c
Unescape View File

@ -43,7 +43,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "window.h" #include "window.h"
#if 0 #if 0

2
clients/weston-debug.c
Unescape View File

@ -42,7 +42,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "weston-debug-client-protocol.h" #include "weston-debug-client-protocol.h"
struct debug_app { struct debug_app {

2
clients/weston-info.c
Unescape View File

@ -38,7 +38,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "presentation-time-client-protocol.h" #include "presentation-time-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "tablet-unstable-v2-client-protocol.h" #include "tablet-unstable-v2-client-protocol.h"

2
clients/window.c
Unescape View File

@ -73,7 +73,7 @@ typedef void *EGLContext;
#include "shared/cairo-util.h" #include "shared/cairo-util.h"
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "text-cursor-position-client-protocol.h" #include "text-cursor-position-client-protocol.h"
#include "pointer-constraints-unstable-v1-client-protocol.h" #include "pointer-constraints-unstable-v1-client-protocol.h"

2
clients/window.h
Unescape View File

@ -32,7 +32,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <cairo.h> #include <cairo.h>
#include <libweston/config-parser.h> #include <libweston/config-parser.h>
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "shared/platform.h" #include "shared/platform.h"
struct window; struct window;

2
compositor/systemd-notify.c
Unescape View File

@ -32,7 +32,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/string-helpers.h" #include "shared/string-helpers.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "weston.h" #include "weston.h"

2
include/libweston/libweston.h
Unescape View File

@ -43,7 +43,7 @@ extern "C" {
#include <libweston/matrix.h> #include <libweston/matrix.h>
#include <libweston/config-parser.h> #include <libweston/config-parser.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include <libweston/timeline-object.h> #include <libweston/timeline-object.h>
struct weston_geometry { struct weston_geometry {

1
include/libweston/meson.build
Unescape View File

@ -5,6 +5,7 @@ install_headers(
'plugin-registry.h', 'plugin-registry.h',
'timeline-object.h', 'timeline-object.h',
'windowed-output-api.h', 'windowed-output-api.h',
'zalloc.h',
subdir: dir_include_libweston_install subdir: dir_include_libweston_install
) )

0
shared/zalloc.h → include/libweston/zalloc.h
Unescape View File

2
libweston-desktop/client.c
Unescape View File

@ -26,7 +26,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include "libweston-desktop.h"
#include "internal.h" #include "internal.h"

2
libweston-desktop/libweston-desktop.c
Unescape View File

@ -29,7 +29,7 @@
#include <assert.h> #include <assert.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "helpers.h" #include "helpers.h"
#include "libweston-desktop.h" #include "libweston-desktop.h"

2
libweston-desktop/seat.c
Unescape View File

@ -31,7 +31,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include "libweston-desktop.h"
#include "internal.h" #include "internal.h"

2
libweston-desktop/surface.c
Unescape View File

@ -29,7 +29,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include "libweston-desktop.h"
#include "internal.h" #include "internal.h"

2
libweston-desktop/wl-shell.c
Unescape View File

@ -31,7 +31,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include "libweston-desktop.h"
#include "internal.h" #include "internal.h"

2
libweston-desktop/xdg-shell-v6.c
Unescape View File

@ -32,7 +32,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-unstable-v6-server-protocol.h" #include "xdg-shell-unstable-v6-server-protocol.h"
#include "libweston-desktop.h" #include "libweston-desktop.h"

2
libweston-desktop/xdg-shell.c
Unescape View File

@ -32,7 +32,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "xdg-shell-server-protocol.h" #include "xdg-shell-server-protocol.h"
#include "libweston-desktop.h" #include "libweston-desktop.h"

2
libweston-desktop/xwayland.c
Unescape View File

@ -31,7 +31,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "zalloc.h" #include <libweston/zalloc.h>
#include "libweston-desktop.h" #include "libweston-desktop.h"
#include "internal.h" #include "internal.h"

5
libweston/meson.build
Unescape View File

@ -56,11 +56,6 @@ srcs_libweston = [
weston_debug_server_protocol_h, weston_debug_server_protocol_h,
] ]
install_headers(
'../shared/zalloc.h',
subdir: dir_include_libweston
)
if get_option('renderer-gl') if get_option('renderer-gl')
dep_egl = dependency('egl', required: false) dep_egl = dependency('egl', required: false)
if not dep_egl.found() if not dep_egl.found()

2
libweston/touch-calibration.c
Unescape View File

@ -31,7 +31,7 @@
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/string-helpers.h" #include "shared/string-helpers.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include <libweston/libweston.h> #include <libweston/libweston.h>

2
shared/xalloc.h
Unescape View File

@ -34,7 +34,7 @@ extern "C" {
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "zalloc.h" #include <libweston/zalloc.h>
void * void *
fail_on_null(void *p, size_t size, char *file, int32_t line); fail_on_null(void *p, size_t size, char *file, int32_t line);

2
tests/input-timestamps-helper.c
Unescape View File

@ -33,7 +33,7 @@
#include "input-timestamps-helper.h" #include "input-timestamps-helper.h"
#include "input-timestamps-unstable-v1-client-protocol.h" #include "input-timestamps-unstable-v1-client-protocol.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "weston-test-client-helper.h" #include "weston-test-client-helper.h"
struct input_timestamps { struct input_timestamps {

8
tests/meson.build
Unescape View File

@ -221,7 +221,7 @@ if get_option('shell-ivi')
weston_test_protocol_c, weston_test_protocol_c,
ivi_application_client_protocol_h, ivi_application_client_protocol_h,
ivi_application_protocol_c, ivi_application_protocol_c,
include_directories: include_directories('..', '../shared'), include_directories: [ include_directories('..', '../shared'), public_inc ],
dependencies: dep_test_client, dependencies: dep_test_client,
install: false install: false
) )
@ -261,7 +261,7 @@ foreach t : tests_standalone
srcs_t, srcs_t,
c_args: [ '-DUNIT_TEST' ], c_args: [ '-DUNIT_TEST' ],
build_by_default: true, build_by_default: true,
include_directories: include_directories('..', '../shared', '../libweston'), include_directories: [ include_directories('..', '../shared', '../libweston'), public_inc ],
dependencies: deps_t, dependencies: deps_t,
install: false, install: false,
) )
@ -325,8 +325,10 @@ foreach t : tests_weston
'test-@0@'.format(t.get(0)), 'test-@0@'.format(t.get(0)),
srcs_t, srcs_t,
c_args: [ '-DUNIT_TEST' ], c_args: [ '-DUNIT_TEST' ],
include_directories: include_directories: [
include_directories('..', '../shared'), include_directories('..', '../shared'),
public_inc,
],
dependencies: deps_t, dependencies: deps_t,
install: false, install: false,
) )

2
tests/weston-test-client-helper.c
Unescape View File

@ -36,7 +36,7 @@
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "shared/xalloc.h" #include "shared/xalloc.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "weston-test-client-helper.h" #include "weston-test-client-helper.h"
#define max(a, b) (((a) > (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b))

2
tools/zunitc/src/zuc_base_logger.c
Unescape View File

@ -37,7 +37,7 @@
#include "zuc_event_listener.h" #include "zuc_event_listener.h"
#include "zuc_types.h" #include "zuc_types.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
/* a few sequences for rudimentary ANSI graphics. */ /* a few sequences for rudimentary ANSI graphics. */
#define CSI_GRN "\x1b[0;32m" #define CSI_GRN "\x1b[0;32m"

2
tools/zunitc/src/zuc_collector.c
Unescape View File

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "shared/zalloc.h" #include <libweston/zalloc.h>
#include "zuc_event_listener.h" #include "zuc_event_listener.h"
#include "zunitc/zunitc_impl.h" #include "zunitc/zunitc_impl.h"

3
tools/zunitc/src/zuc_junit_reporter.c
Unescape View File

@ -42,7 +42,7 @@
#include "zuc_event_listener.h" #include "zuc_event_listener.h"
#include "zuc_types.h" #include "zuc_types.h"
#include "shared/zalloc.h" #include <libweston/zalloc.h>
/** /**
* Hardcoded output name. * Hardcoded output name.
@ -460,7 +460,6 @@ zuc_junit_reporter_create(void)
#else /* ENABLE_JUNIT_XML */ #else /* ENABLE_JUNIT_XML */
#include "shared/zalloc.h"
#include "zuc_event_listener.h" #include "zuc_event_listener.h"
/* /*

2
tools/zunitc/src/zunitc_impl.c
Unescape View File

@ -48,7 +48,7 @@
#include <libweston/config-parser.h> #include <libweston/config-parser.h>
#include "shared/helpers.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 * If CLOCK_MONOTONIC is present on the system it will give us reliable

Write Preview
Loading…
Cancel
Save