diff options
author | Jim Grandy <jgrandy@authentic8.com> | 2013-08-08 09:21:40 -0700 |
---|---|---|
committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-08 09:21:40 -0700 |
commit | 8582b4a1b61095e8525d8feea0b2eea9e6b762a6 (patch) | |
tree | d2880377e8e5a56e4cfa169b4b276a4298e128bb /sesman | |
parent | 23619142b0ddb7f7e1d72dc9e17d89f2f74db7d0 (diff) | |
download | xrdp-proprietary-8582b4a1b61095e8525d8feea0b2eea9e6b762a6.tar.gz xrdp-proprietary-8582b4a1b61095e8525d8feea0b2eea9e6b762a6.zip |
Fix errors cause by previous merge (2361914)
Diffstat (limited to 'sesman')
-rw-r--r-- | sesman/chansrv/clipboard.c | 2 | ||||
-rw-r--r-- | sesman/chansrv/rail.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c index 3d73d2f9..a41c2909 100644 --- a/sesman/chansrv/clipboard.c +++ b/sesman/chansrv/clipboard.c @@ -249,6 +249,8 @@ static int g_num_formatIds = 0; static int g_file_format_id = -1; +static char g_last_atom_name[256] = ""; + /*****************************************************************************/ static char* APP_CC get_atom_text(Atom atom) diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c index 10a67f07..3b8b2a0c 100644 --- a/sesman/chansrv/rail.c +++ b/sesman/chansrv/rail.c @@ -69,6 +69,8 @@ static Window g_focus_win = 0; static int g_xrr_event_base = 0; /* non zero means we got extension */ +static Cursor g_default_cursor = 0; + /* used in valid field of struct rail_window_data */ #define RWD_X (1 << 0) #define RWD_Y (1 << 1) |