[MPlayer-cvslog] r34112 - trunk/libvo/x11_common.h

[reimar]

Author: reimar
Date: Tue Sep 20 00:03:36 2011
New Revision: 34112

Log:
Remove unnecessary #ifdefs from header file.

Modified:
   trunk/libvo/x11_common.h

Modified: trunk/libvo/x11_common.h
==============================================================================
--- trunk/libvo/x11_common.h	Sun Sep 18 18:51:40 2011	(r34111)
+++ trunk/libvo/x11_common.h	Tue Sep 20 00:03:36 2011	(r34112)
@@ -96,8 +96,9 @@ extern Window     vo_window;
 extern GC         vo_gc;
 extern XSizeHints vo_hint;
 
-#ifdef CONFIG_XV
-//XvPortID xv_port;
+
+
+// XVideo related declarations
 extern unsigned int xv_port;
 
 int vo_xv_set_eq(uint32_t xv_port, const char * name, int value);
@@ -132,7 +133,8 @@ void xv_setup_colorkeyhandling(char cons
 /*** test functions for common suboptions ***/
 int xv_test_ck( void * arg );
 int xv_test_ckm( void * arg );
-#endif
+
+
 
 void vo_setwindow( Window w,GC g );
 void vo_x11_putkey(int key);
@@ -141,10 +143,13 @@ void xscreensaver_heartbeat(void);
 void saver_off( Display * );
 void saver_on( Display * );
 
-#ifdef CONFIG_XF86VM
+
+
+// XF86VM-related functions
 void vo_vm_switch(void);
 void vo_vm_close(void);
-#endif
+
+
 
 void update_xinerama_info(void);