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

Init.c Use dpmsstubs.c instead of an own copy
679e1118 · Ulrich Sibiller · Mike Gabriel · 8558e321 · 679e1118 · 679e1118
Commit 679e1118 authored Jan 18, 2020 by Ulrich Sibiller Committed by Mike Gabriel May 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 27 deletions

Imakefile nx-X11/programs/Xserver/Xext/Imakefile +2 -2

Init.c nx-X11/programs/Xserver/hw/nxagent/Init.c +0 -25

No files found.
--- 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\

--- 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