From 90216a010acde024cb25a2764dafda5f4e5d63f4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 6 Jun 2019 14:25:21 +1000 Subject: [PATCH] path: drop the separate header, not necessary Signed-off-by: Peter Hutterer --- meson.build | 1 - src/path-seat.c | 17 ++++++++++++++++- src/path-seat.h | 45 --------------------------------------------- 3 files changed, 16 insertions(+), 47 deletions(-) delete mode 100644 src/path-seat.h diff --git a/meson.build b/meson.build index 77f27d05..8dbfd7f9 100644 --- a/meson.build +++ b/meson.build @@ -320,7 +320,6 @@ src_libinput = src_libfilter + [ 'src/evdev-tablet-pad.c', 'src/evdev-tablet-pad.h', 'src/evdev-tablet-pad-leds.c', - 'src/path-seat.h', 'src/path-seat.c', 'src/udev-seat.c', 'src/udev-seat.h', diff --git a/src/path-seat.c b/src/path-seat.c index 78f42da7..0e061d1b 100644 --- a/src/path-seat.c +++ b/src/path-seat.c @@ -29,9 +29,24 @@ #include #include -#include "path-seat.h" #include "evdev.h" +struct path_input { + struct libinput base; + struct udev *udev; + struct list path_list; +}; + +struct path_device { + struct list link; + struct udev_device *udev_device; +}; + +struct path_seat { + struct libinput_seat base; +}; + + static const char default_seat[] = "seat0"; static const char default_seat_name[] = "default"; diff --git a/src/path-seat.h b/src/path-seat.h deleted file mode 100644 index b3ba855e..00000000 --- a/src/path-seat.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright © 2013 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef _PATH_H_ -#define _PATH_H_ - -#include "config.h" -#include "libinput-private.h" - -struct path_input { - struct libinput base; - struct udev *udev; - struct list path_list; -}; - -struct path_device { - struct list link; - struct udev_device *udev_device; -}; - -struct path_seat { - struct libinput_seat base; -}; - -#endif