frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "include: unexport no*Extension flags" 

This reverts commit e3cbde9914.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2022>
This commit is contained in:
Alan Coopersmith 2025-06-15 12:22:05 -07:00 committed by Marge Bot
parent e610fa3234
commit 33a11228cf
6 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xnest/Args.c
View File

@ -17,7 +17,6 @@ is" without express or implied warranty.
#include <X11/Xdefs.h>
#include <X11/Xproto.h>
#include "include/extinit_priv.h"
#include "os/ddx_priv.h"
#include "screenint.h"

1
hw/xwayland/xwayland-screen.c
View File

@ -43,7 +43,6 @@
#include "os/osdep.h"
#include "os/xserver_poll.h"
#include "extinit_priv.h"
#include <micmap.h>
#include <misyncshm.h>
#include <os.h>

50
include/extinit.h
View File

@ -57,10 +57,60 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern _X_EXPORT Bool noCompositeExtension;
#endif
#ifdef DAMAGE
extern _X_EXPORT Bool noDamageExtension;
#endif
#if defined(DBE)
extern _X_EXPORT Bool noDbeExtension;
#endif
#if defined(DPMSExtension)
extern _X_EXPORT Bool noDPMSExtension;
#endif
#ifdef GLXEXT
extern _X_EXPORT Bool noGlxExtension;
#endif
#ifdef XINERAMA
extern _X_EXPORT Bool noPanoramiXExtension;
#endif /* XINERAMA */
#ifdef RANDR
extern _X_EXPORT Bool noRRExtension;
#endif
extern _X_EXPORT Bool noRenderExtension;
#if defined(RES)
extern _X_EXPORT Bool noResExtension;
#endif
#if defined(SCREENSAVER)
extern _X_EXPORT Bool noScreenSaverExtension;
#endif
extern _X_EXPORT Bool noShapeExtension;
#ifdef MITSHM
extern _X_EXPORT Bool noMITShmExtension;
#endif
#ifdef XCSECURITY
extern _X_EXPORT Bool noSecurityExtension;
#endif
#ifdef XF86BIGFONT
extern _X_EXPORT Bool noXFree86BigfontExtension;
#endif
extern _X_EXPORT Bool noXFixesExtension;
#if defined(XSELINUX)
extern _X_EXPORT Bool noSELinuxExtension;
#endif
#if defined(XV)
extern _X_EXPORT Bool noXvExtension;
#endif

16
include/extinit_priv.h
View File

@ -8,22 +8,6 @@
#include "extinit.h"
extern Bool noDamageExtension;
extern Bool noDbeExtension;
extern Bool noDPMSExtension;
extern Bool noGlxExtension;
extern Bool noMITShmExtension;
extern Bool noRenderExtension;
extern Bool noResExtension;
extern Bool noRRExtension;
extern Bool noScreenSaverExtension;
extern Bool noSecurityExtension;
extern Bool noSELinuxExtension;
extern Bool noShapeExtension;
extern Bool noTestExtensions;
extern Bool noXFixesExtension;
extern Bool noXFree86BigfontExtension;
void CompositeExtensionInit(void);
void DamageExtensionInit(void);
void DbeExtensionInit(void);

1
include/globals.h
View File

@ -25,6 +25,7 @@ extern _X_EXPORT int monitorResolution;
extern _X_EXPORT int defaultColorVisualClass;
extern _X_EXPORT int GrabInProgress;
extern _X_EXPORT Bool noTestExtensions;
extern _X_EXPORT char *SeatId;
extern _X_EXPORT char *ConnectionInfo;
extern _X_EXPORT sig_atomic_t inSignalContext;

1
os/utils.c
View File

@ -119,7 +119,6 @@ __stdcall unsigned long GetTickCount(void);
#include "present.h"
#include "dixstruct_priv.h"
#include "dpmsproc.h"
#include "extinit_priv.h"
#define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h>