From d283d5236ab36bc55c73de4e152dabea7098f850 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@symbol.nonexistent.invalid>
Date: Sun, 20 Apr 2008 06:39:29 +0300
Subject: x11_common.c: Make some functions static

---
 libvo/x11_common.c | 14 ++++++++------
 libvo/x11_common.h |  9 ---------
 2 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'libvo')

diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 6f91c2aef0..47758b0d08 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -119,6 +119,8 @@ XF86VidModeModeLine modeline;
 #endif
 
 static int vo_x11_get_fs_type(int supported);
+static void saver_off(Display *);
+static void saver_on(Display *);
 
 
 /*
@@ -163,7 +165,7 @@ void vo_x11_ewmh_fullscreen(int action)
     }
 }
 
-void vo_hidecursor(Display * disp, Window win)
+static void vo_hidecursor(Display * disp, Window win)
 {
     Cursor no_ptr;
     Pixmap bm_no;
@@ -188,7 +190,7 @@ void vo_hidecursor(Display * disp, Window win)
     XFreeColors(disp,colormap,&black.pixel,1,0);
 }
 
-void vo_showcursor(Display * disp, Window win)
+static void vo_showcursor(Display * disp, Window win)
 {
     if (WinID == 0)
         return;
@@ -1169,7 +1171,7 @@ int vo_x11_check_events(Display * mydisplay)
 /**
  * \brief sets the size and position of the non-fullscreen window.
  */
-void vo_x11_nofs_sizepos(int x, int y, int width, int height)
+static void vo_x11_nofs_sizepos(int x, int y, int width, int height)
 {
   vo_x11_sizehint(x, y, width, height, 0);
   if (vo_fs) {
@@ -1246,7 +1248,7 @@ static int vo_x11_get_gnome_layer(Display * mDisplay, Window win)
 }
 
 //
-Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot,
+static Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot,
                                    Visual * vis, int x, int y,
                                    unsigned int width, unsigned int height,
                                    int depth, Colormap col_map)
@@ -1630,7 +1632,7 @@ static int xss_suspend(Bool suspend)
  * End of XScreensaver stuff
  */
 
-void saver_on(Display * mDisplay)
+static void saver_on(Display * mDisplay)
 {
 
     if (!screensaver_off)
@@ -1670,7 +1672,7 @@ void saver_on(Display * mDisplay)
 #endif
 }
 
-void saver_off(Display * mDisplay)
+static void saver_off(Display * mDisplay)
 {
     int nothing;
 
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index b19a02377c..fa9d7d0444 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -38,11 +38,8 @@ extern int vo_mouse_autohide;
 
 extern int vo_init( void );
 extern void vo_uninit( void );
-extern void vo_hidecursor ( Display* , Window );
-extern void vo_showcursor( Display *disp, Window win );
 extern void vo_x11_decoration( Display * vo_Display,Window w,int d );
 extern void vo_x11_classhint( Display * display,Window window,char *name );
-extern void vo_x11_nofs_sizepos(int x, int y, int width, int height);
 extern void vo_x11_sizehint( int x, int y, int width, int height, int max );
 extern int vo_x11_check_events(Display *mydisplay);
 extern void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask);
@@ -53,9 +50,6 @@ extern Colormap vo_x11_create_colormap(XVisualInfo *vinfo);
 extern uint32_t vo_x11_set_equalizer(char *name, int value);
 extern uint32_t vo_x11_get_equalizer(char *name, int *value);
 extern void fstype_help(void);
-extern Window vo_x11_create_smooth_window( Display *mDisplay, Window mRoot,
-	Visual *vis, int x, int y, unsigned int width, unsigned int height,
-	int depth, Colormap col_map);
 void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis,
         int x, int y, unsigned int width, unsigned int height, int flags,
 	Colormap col_map, const char *classname, const char *title);
@@ -112,9 +106,6 @@ int xv_test_ckm( void * arg );
  extern void vo_setwindow( Window w,GC g );
  extern void vo_x11_putkey(int key);
 
-void saver_off( Display * );
-void saver_on( Display * );
-
 #ifdef HAVE_XF86VM
 void vo_vm_switch(uint32_t, uint32_t, int*, int*);
 void vo_vm_close(Display*);
-- 
cgit v1.2.3