mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: Avoid clash with other config-headers

Browse source
This commit is contained in:
Björn Esser 2017-12-27 14:37:55 +01:00
parent a0d2a6b445
commit ff13849624
No known key found for this signature in database
GPG key ID: F52E98007594C21D
18 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/session/direct-ipc.c
View file

@ -18,7 +18,7 @@
#include <linux/major.h>
#endif
#include <xf86drm.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/util/log.h>
#include "backend/session/direct-ipc.h"

2
backend/session/logind.c
View file

@ -10,7 +10,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <wayland-server.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/backend/session/interface.h>
#include <wlr/util/log.h>

2
backend/session/session.c
View file

@ -9,7 +9,7 @@
#include <wayland-server.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/backend/session.h>
#include <wlr/backend/session/interface.h>
#include <wlr/util/log.h>

3
examples/support/config.c
View file

@ -7,9 +7,10 @@
#include <string.h>
#include <unistd.h>
#include <sys/param.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/util/log.h>
#include <wlr/types/wlr_box.h>
#include "support/config.h"
#include "shared.h"
#include "ini.h"

1
include/meson.build Normal file
View file

@ -0,0 +1 @@
subdir('wlr')

2
include/rootston/desktop.h
View file

@ -2,7 +2,7 @@
#define _ROOTSTON_DESKTOP_H
#include <time.h>
#include <wayland-server.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_compositor.h>

2
include/rootston/server.h
View file

@ -1,7 +1,7 @@
#ifndef _ROOTSTON_SERVER_H
#define _ROOTSTON_SERVER_H
#include <wayland-server.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/backend.h>
#include <wlr/backend/session.h>
#include <wlr/types/wlr_data_device.h>

2
include/rootston/view.h
View file

@ -2,7 +2,7 @@
#define _ROOTSTON_VIEW_H
#include <stdbool.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_xdg_shell_v6.h>

1
include/wlr/meson.build Normal file
View file

@ -0,0 +1 @@
configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)

2
include/wlr/xwayland.h
View file

@ -3,7 +3,7 @@
#include <time.h>
#include <stdbool.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_seat.h>
#include <xcb/xcb.h>

2
meson.build
View file

@ -89,10 +89,10 @@ if get_option('enable_xwayland')
else
exclude_files += ['xwayland.h', 'xwm.h']
endif
configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_files)
subdir('include')
subdir('protocol')
subdir('render')
subdir('backend')

2
rootston/config.c
View file

@ -9,7 +9,7 @@
#include <strings.h>
#include <unistd.h>
#include <sys/param.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/util/log.h>
#include <wlr/types/wlr_box.h>
#include "rootston/config.h"

2
rootston/desktop.c
View file

@ -3,7 +3,7 @@
#include <time.h>
#include <stdlib.h>
#include <math.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_cursor.h>

2
rootston/main.c
View file

@ -3,7 +3,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <wayland-server.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/backend.h>
#include <wlr/backend/headless.h>
#include <wlr/backend/multi.h>

2
rootston/seat.c
View file

@ -2,7 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/util/log.h>
#include "rootston/xcursor.h"

2
rootston/xwayland.c
View file

@ -2,7 +2,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <wayland-server.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/xwayland.h>

2
types/wlr_xdg_shell_v6.c
View file

@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
#include "config.h"
#include <wlr/config.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_seat.h>

2
xwayland/xwm.c
View file

@ -7,7 +7,7 @@
#include <xcb/xfixes.h>
#include <xcb/xcb_image.h>
#include <xcb/render.h>
#include "config.h"
#include <wlr/config.h>
#include "wlr/util/log.h"
#include "wlr/util/edges.h"
#include "wlr/types/wlr_surface.h"