Skip to content

N
nx-libs
Commit 679e1118 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

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
parent 8558e321
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 27 deletions
nx-X11/programs/Xserver/Xext/Imakefile
View file @ 679e1118
...@@ -65,8 +65,8 @@ XF86BIGFOBJS = xf86bigfont.o ...@@ -65,8 +65,8 @@ XF86BIGFOBJS = xf86bigfont.o
PNRXINCLUDES = -I../mi -I../render PNRXINCLUDES = -I../mi -I../render
#endif #endif
#if BuildDPMS #if BuildDPMS
DPMSSRCS = dpms.c DPMSSRCS = dpms.c dpmsstubs.c
DPMSOBJS = dpms.o DPMSOBJS = dpms.o dpmsstubs.o
#endif #endif
SRCS = shape.c $(SHMSRCS) xcmisc.c\ SRCS = shape.c $(SHMSRCS) xcmisc.c\
......
nx-X11/programs/Xserver/hw/nxagent/Init.c
View file @ 679e1118
...@@ -98,15 +98,6 @@ extern int (*ProcVector[256])(ClientPtr); ...@@ -98,15 +98,6 @@ extern int (*ProcVector[256])(ClientPtr);
*/ */
extern int fbGCPrivateIndex; 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. * Our error logging function.
*/ */
...@@ -625,19 +616,3 @@ static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data, ...@@ -625,19 +616,3 @@ static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data,
nxagentGrabServerInfo.client = grab->client; nxagentGrabServerInfo.client = grab->client;
nxagentGrabServerInfo.grabstate = grab->grabstate; nxagentGrabServerInfo.grabstate = grab->grabstate;
} }
#ifdef DPMSExtension
void DPMSSet(int level)
{
}
int DPMSGet(int *level)
{
return -1;
}
Bool DPMSSupported(void)
{
return 0;
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment