diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2020-01-18 13:49:22 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 14:57:15 +0200 |
| commit | 679e11182c22bcb2408daf784d32586537a9580b (patch) | |
| tree | c4840eec87c6e93d62e3f020489f74ef01f98e35 | |
| parent | 8558e321f8cc27a7ecb0bc9db2ec87feed3cf877 (diff) | |
| download | nx-libs-679e11182c22bcb2408daf784d32586537a9580b.tar.gz nx-libs-679e11182c22bcb2408daf784d32586537a9580b.tar.bz2 nx-libs-679e11182c22bcb2408daf784d32586537a9580b.zip | |
Init.c Use dpmsstubs.c instead of an own copy
Derived from
commit 978f3b496b9951ee8120a0efcc5cd12503e26770
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Mar 5 21:38:29 2005 +0000
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xnest/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2653) attachment #2020
(https://bugs.freedesktop.org/attachment.cgi?id=2020): Cleanup Xnest
usage of the DPMS dummy stub functions from dpmsstubs.c instead of
using it's own copy of these functions.
Fixes ArcticaProject/nx-libs#901
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 25 |
2 files changed, 2 insertions, 27 deletions
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index 8198e302c..540ac80fa 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -65,8 +65,8 @@ XF86BIGFOBJS = xf86bigfont.o PNRXINCLUDES = -I../mi -I../render #endif #if BuildDPMS - DPMSSRCS = dpms.c - DPMSOBJS = dpms.o + DPMSSRCS = dpms.c dpmsstubs.c + DPMSOBJS = dpms.o dpmsstubs.o #endif SRCS = shape.c $(SHMSRCS) xcmisc.c\ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index cf156c35f..b4d8a270c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -98,15 +98,6 @@ extern int (*ProcVector[256])(ClientPtr); */ extern int fbGCPrivateIndex; -#ifdef DPMSExtension -/* - * Stubs for the DPMS extension. - */ -void DPMSSet(int level); -int DPMSGet(int *level); -Bool DPMSSupported(void); -#endif - /* * Our error logging function. */ @@ -625,19 +616,3 @@ static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data, nxagentGrabServerInfo.client = grab->client; nxagentGrabServerInfo.grabstate = grab->grabstate; } - -#ifdef DPMSExtension -void DPMSSet(int level) -{ -} - -int DPMSGet(int *level) -{ - return -1; -} - -Bool DPMSSupported(void) -{ - return 0; -} -#endif |