Rename compositor.h to libweston/libweston.h
The main idea is to make libweston users use the form #include <libweston/libweston.h> instead of the plain #include <compositor.h> which is prone to name conflicts. This is reflected both in the installed files, and the internal header search paths so that Weston would use the exact same form as an external project using libweston would. The public headers are moved under a new top-level directory include/ to make them clearly stand out as special (public API). Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
#include <string.h>
|
||||
#include <colord.h>
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "weston.h"
|
||||
#include "cms-helper.h"
|
||||
#include "shared/helpers.h"
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <lcms2.h>
|
||||
#endif
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "cms-helper.h"
|
||||
|
||||
#ifdef HAVE_LCMS
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
|
||||
/* General overview on how to be a CMS plugin:
|
||||
*
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "cms-helper.h"
|
||||
#include "shared/helpers.h"
|
||||
#include "weston.h"
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@
|
||||
#include <linux/limits.h>
|
||||
|
||||
#include "weston.h"
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "../shared/os-compatibility.h"
|
||||
#include "../shared/helpers.h"
|
||||
#include "../shared/string-helpers.h"
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
#include <wayland-client.h>
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "weston.h"
|
||||
#include "shared/helpers.h"
|
||||
#include "shared/os-compatibility.h"
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "shared/helpers.h"
|
||||
#include "shared/string-helpers.h"
|
||||
#include "shared/zalloc.h"
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "weston.h"
|
||||
|
||||
struct systemd_notifier {
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <unistd.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "weston.h"
|
||||
#include "text-input-unstable-v1-server-protocol.h"
|
||||
#include "input-method-unstable-v1-server-protocol.h"
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <stdint.h>
|
||||
#include <linux/input.h>
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "weston.h"
|
||||
#include "weston-screenshooter-server-protocol.h"
|
||||
#include "shared/helpers.h"
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <compositor.h>
|
||||
#include <libweston/libweston.h>
|
||||
|
||||
void
|
||||
screenshooter_create(struct weston_compositor *ec);
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <signal.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include "compositor.h"
|
||||
#include <libweston/libweston.h>
|
||||
#include "compositor/weston.h"
|
||||
#include "xwayland/xwayland-api.h"
|
||||
#include "shared/helpers.h"
|
||||
|
||||
Reference in New Issue
Block a user