From b3790a0c26f01f892a4c25944fed24f4c00bb5e4 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 19:12:08 +0200 Subject: [PATCH] (submit/miext-extinit) present: unexport present_extension_init() It's not called by drivers/modules, so no need to keep it exported. Signed-off-by: Enrico Weigelt, metux IT consult --- include/extinit.h | 4 ---- include/extinit_priv.h | 1 + present/meson.build | 1 - present/present.h | 1 - present/present_screen.c | 2 ++ present/presentext.h | 29 ----------------------------- 6 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 present/presentext.h diff --git a/include/extinit.h b/include/extinit.h index 1d478f0a1..c834ed608 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -88,8 +88,4 @@ extern _X_EXPORT Bool noSELinuxExtension; extern _X_EXPORT Bool noXvExtension; #endif -#if defined(PRESENT) -#include "presentext.h" -#endif - #endif diff --git a/include/extinit_priv.h b/include/extinit_priv.h index 9c28bf5c2..adf928c26 100644 --- a/include/extinit_priv.h +++ b/include/extinit_priv.h @@ -47,5 +47,6 @@ void XvExtensionInit(void); void XvMCExtensionInit(void); void dri3_extension_init(void); void PseudoramiXExtensionInit(void); +void present_extension_init(void); #endif /* _XSERVER_EXTINIT_PRIV_H */ diff --git a/present/meson.build b/present/meson.build index bc806a668..df8d40b02 100644 --- a/present/meson.build +++ b/present/meson.build @@ -13,7 +13,6 @@ srcs_present = [ hdrs_present = [ 'present.h', - 'presentext.h', ] libxserver_present = static_library('libxserver_present', diff --git a/present/present.h b/present/present.h index c6762cecc..3ae798c34 100644 --- a/present/present.h +++ b/present/present.h @@ -25,7 +25,6 @@ #include #include "randrstr.h" -#include "presentext.h" typedef enum { PRESENT_FLIP_REASON_UNKNOWN, diff --git a/present/present_screen.c b/present/present_screen.c index 0589b2ee9..e630dae76 100644 --- a/present/present_screen.c +++ b/present/present_screen.c @@ -22,6 +22,8 @@ #include "present_priv.h" +#include "extinit_priv.h" + int present_request; DevPrivateKeyRec present_screen_private_key; DevPrivateKeyRec present_window_private_key; diff --git a/present/presentext.h b/present/presentext.h deleted file mode 100644 index f177f55dc..000000000 --- a/present/presentext.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright © 2013 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of the copyright holders not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. The copyright holders make no representations - * about the suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#ifndef _PRESENTEXT_H_ -#define _PRESENTEXT_H_ - -extern _X_EXPORT void -present_extension_init(void); - -#endif /* _PRESENTEXT_H_ */