diff --git a/include/extinit.h b/include/extinit.h index bbb7de345..0c93863f7 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -65,8 +65,4 @@ extern _X_EXPORT Bool noPanoramiXExtension; 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 71e7f295d..8e06a3f76 100644 --- a/include/extinit_priv.h +++ b/include/extinit_priv.h @@ -52,5 +52,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 3aeed270b..98ac4993b 100644 --- a/present/present.h +++ b/present/present.h @@ -27,7 +27,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 a72d51aab..81cf4254d 100644 --- a/present/present_screen.c +++ b/present/present_screen.c @@ -25,6 +25,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 57bd6a6b4..000000000 --- a/present/presentext.h +++ /dev/null @@ -1,30 +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_ - -#include - -_X_EXPORT void present_extension_init(void); - -#endif /* _PRESENTEXT_H_ */