From 94fd9a56942b28f19418e303fef7871099a8ff75 Mon Sep 17 00:00:00 2001 From: Egor Starkov Date: Tue, 29 Sep 2015 14:50:41 +0300 Subject: [PATCH] compositor: remove systemd-notify.h Systemd notifications support was converted into loadable module, so systemd-notify.h header is not needed. Signed-off-by: Egor Starkov Reviewed-by: Pekka Paalanen Reviewed-by: Bryce Harrington --- Makefile.am | 4 +--- src/main.c | 1 - src/systemd-notify.h | 47 -------------------------------------------- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 src/systemd-notify.h diff --git a/Makefile.am b/Makefile.am index c6d2ba66..19003909 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,8 +95,7 @@ weston_SOURCES = \ shared/timespec-util.h \ shared/zalloc.h \ shared/platform.h \ - src/weston-egl-ext.h \ - src/systemd-notify.h + src/weston-egl-ext.h if SYSTEMD_NOTIFY_SUPPORT module_LTLIBRARIES += systemd-notify.la @@ -108,7 +107,6 @@ systemd_notify_la_CFLAGS = \ $(AM_CFLAGS) systemd_notify_la_SOURCES = \ src/systemd-notify.c \ - src/systemd-notify.h \ shared/helpers.h \ shared/zalloc.h \ src/compositor.h diff --git a/src/main.c b/src/main.c index 937bed22..a98570ee 100644 --- a/src/main.c +++ b/src/main.c @@ -46,7 +46,6 @@ #include "../shared/helpers.h" #include "git-version.h" #include "version.h" -#include "systemd-notify.h" static struct wl_list child_process_list; static struct weston_compositor *segv_compositor; diff --git a/src/systemd-notify.h b/src/systemd-notify.h deleted file mode 100644 index 947875eb..00000000 --- a/src/systemd-notify.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2015 General Electric Company. All rights reserved. - * - * 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 _SYSTEMD_NOTIFY_H_ -#define _SYSTEMD_NOTIFY_H_ - -#include "config.h" - -#ifdef SYSTEMD_NOTIFY_SUPPORT - -struct weston_compositor; - -void -weston_systemd_service_start(struct weston_compositor *compositor); - -#else - -static inline void -weston_systemd_service_start(struct weston_compositor *compositor) -{ -} - -#endif //SYSTEMD_NOTIFY_SUPPORT - -#endif //_SYSTEMD_NOTIFY_H_