x [skip ci]

Author: firewave

sesman/chansrv/clipboard.c

@@ -185,11 +185,7 @@ x-special/gnome-copied-files
 #define BMPINFOHEADER_LEN       40
 
 extern Display *g_display;      /* in xcommon.c */
-extern int g_x_socket;          /* in xcommon.c */
-extern tbus g_x_wait_obj;       /* in xcommon.c */
 extern Screen *g_screen;        /* in xcommon.c */
-extern int g_screen_num;        /* in xcommon.c */
-
 int g_clip_up = 0;
 
 static Atom g_clipboard_atom = 0;      /* CLIPBOARD */

sesman/chansrv/xcommon.c

@@ -30,21 +30,17 @@
 #include "rail.h"
 #include "xcommon.h"
 
-extern int g_clip_up;                         /* in clipboard.c */
-
-extern int g_rail_up;                         /* in rail.c */
-
-Display *g_display = 0;
+static Display *g_display = 0;
 int g_x_socket = 0;
 tbus g_x_wait_obj = 0;
-Screen *g_screen = 0;
-int g_screen_num = 0;
-Window g_root_window = 0;
-Atom g_wm_delete_window_atom = 0;
-Atom g_wm_protocols_atom = 0;
-Atom g_utf8_string = 0;
-Atom g_net_wm_name = 0;
-Atom g_wm_state = 0;
+static Screen *g_screen = 0;
+static int g_screen_num = 0;
+static Window g_root_window = 0;
+static Atom g_wm_delete_window_atom = 0;
+static Atom g_wm_protocols_atom = 0;
+static Atom g_utf8_string = 0;
+static Atom g_net_wm_name = 0;
+static Atom g_wm_state = 0;
 
 static x_server_fatal_cb_type x_server_fatal_handler = 0;
 

sesman/chansrv/xcommon.h

@@ -28,6 +28,10 @@
 
 typedef void (*x_server_fatal_cb_type)(void);
 
+extern int g_x_socket;
+extern tbus g_x_wait_obj;
+extern int g_screen_num;
+
 int
 xcommon_init(void);
 int

sesman/tools/xcon.c

@@ -29,7 +29,7 @@
 #include <X11/Xlib.h>
 #include <sys/select.h>
 
-Display *g_display = 0;
+static Display *g_display = 0;
 int g_x_socket = 0;
 
 int main(int argc, char **argv)

xrdp_accel_assist/xrdp_accel_assist_x11.c

@@ -59,7 +59,7 @@
 
 /* X11 */
 Display *g_display = NULL;
-static int g_x_socket = 0;
+int g_x_socket = 0;
 int g_screen_num = 0;
 static Screen *g_screen = NULL;
 Window g_root_window = None;