mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <egor.starkov@ge.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Egor Starkov 2015-09-29 14:50:41 +03:00 committed by Bryce Harrington
parent 90eea27f05
commit 94fd9a5694
3 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -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

1
src/main.c
View File

@ -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;

47
src/systemd-notify.h
View File

@ -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_