[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.25,1.26

[Jürgen Keil]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv27841/libvo

Modified Files:
	x11_common.c 
Log Message:
x11_common does not compile, when the XDPMS extension is not available on the
target system.


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- x11_common.c	3 Jul 2001 23:23:55 -0000	1.25
+++ x11_common.c	19 Jul 2001 18:47:22 -0000	1.26
@@ -17,7 +17,9 @@
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
+#ifdef HAVE_XDPMS
 #include <X11/extensions/dpms.h>
+#endif
 
 static int dpms_disabled=0;
 static int timeout_save=0;
@@ -278,6 +280,7 @@
 
 void saver_on(Display *mDisplay) {
 
+#ifdef HAVE_XDPMS
     int nothing;
     if (dpms_disabled)
     {
@@ -298,7 +301,8 @@
             }
 	}
     }
-    
+#endif
+
     if (timeout_save)
     {
 	int dummy, interval, prefer_blank, allow_exp;
@@ -311,7 +315,9 @@
 
 void saver_off(Display *mDisplay) {
 
-    int interval, prefer_blank, allow_exp, nothing;
+    int interval, prefer_blank, allow_exp;
+#ifdef HAVE_XDPMS
+    int nothing;
 
     if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
     {
@@ -327,6 +333,7 @@
             printf ("stat: %d\n", stat);
 	}
     }
+#endif
     XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
     if (timeout_save)
 	XSetScreenSaver(mDisplay, 0, interval, prefer_blank, allow_exp);