Merge branch 'master' into rootston

This commit is contained in:
Drew DeVault 2017-09-25 08:29:35 -04:00
commit f4387b437f
56 changed files with 376 additions and 121 deletions

View file

@ -1,5 +1,5 @@
#ifndef DRM_PROPERTIES_H
#define DRM_PROPERTIES_H
#ifndef BACKEND_DRM_PROPERTIES_H
#define BACKEND_DRM_PROPERTIES_H
#include <stdbool.h>
#include <stdint.h>

View file

@ -1,5 +1,5 @@
#ifndef WLR_DRM_UTIL_H
#define WLR_DRM_UTIL_H
#ifndef BACKEND_DRM_UTIL_H
#define BACKEND_DRM_UTIL_H
#include <stdint.h>
#include <xf86drm.h>

View file

@ -1,5 +1,5 @@
#ifndef DRM_BACKEND_H
#define DRM_BACKEND_H
#ifndef BACKEND_DRM_H
#define BACKEND_DRM_H
#include <stdbool.h>
#include <stddef.h>

View file

@ -1,5 +1,5 @@
#ifndef _WLR_BACKEND_LIBINPUT_INTERNAL_H
#define _WLR_BACKEND_LIBINPUT_INTERNAL_H
#ifndef BACKEND_LIBINPUT_H
#define BACKEND_LIBINPUT_H
#include <libinput.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_input_device.h>

View file

@ -1,5 +1,5 @@
#ifndef _WLR_MULTI_BACKEND_INTERNAL
#define _WLR_MULTI_BACKEND_INTERNAL
#ifndef BACKEND_MULTI_H
#define BACKEND_MULTI_H
#include <wlr/backend/interface.h>
#include <wlr/backend/multi.h>

View file

@ -1,5 +1,5 @@
#ifndef SESSION_DIRECT_IPC
#define SESSION_DIRECT_IPC
#ifndef BACKEND_SESSION_DIRECT_IPC_H
#define BACKEND_SESSION_DIRECT_IPC_H
#include <sys/types.h>

View file

@ -1,5 +1,5 @@
#ifndef _WLR_INTERNAL_BACKEND_WAYLAND_H
#define _WLR_INTERNAL_BACKEND_WAYLAND_H
#ifndef BACKEND_WAYLAND_H
#define BACKEND_WAYLAND_H
#include <stdbool.h>
#include <wayland-client.h>