summaryrefslogtreecommitdiffstats
path: root/x11vnc/cursor.c
diff options
context:
space:
mode:
authorrunge <runge>2006-12-28 20:00:08 +0000
committerrunge <runge>2006-12-28 20:00:08 +0000
commit5c9ba4bb035255956dd176b285df3a81bafa02e3 (patch)
tree29bfb0544fca31db024619a612d09b3a5e0132c2 /x11vnc/cursor.c
parentf9baaf1ee49e7889808b1f058a5f348a9cd5f027 (diff)
downloadlibtdevnc-5c9ba4bb035255956dd176b285df3a81bafa02e3.tar.gz
libtdevnc-5c9ba4bb035255956dd176b285df3a81bafa02e3.zip
still more compiler warnings; ssvnc 1.0.9 sync.
Diffstat (limited to 'x11vnc/cursor.c')
-rw-r--r--x11vnc/cursor.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/x11vnc/cursor.c b/x11vnc/cursor.c
index 54ac152..da7e93c 100644
--- a/x11vnc/cursor.c
+++ b/x11vnc/cursor.c
@@ -837,6 +837,11 @@ void setup_cursors_and_push(void) {
*
*/
static void tree_descend_cursor(int *depth, Window *w, win_str_info_t *winfo) {
+#if NO_X11
+ RAWFB_RET_VOID
+ if (!depth || !w || !winfo) {}
+ return;
+#else
Window r, c;
int i, rx, ry, wx, wy;
unsigned int mask;
@@ -848,9 +853,6 @@ static void tree_descend_cursor(int *depth, Window *w, win_str_info_t *winfo) {
XErrorHandler old_handler;
RAWFB_RET_VOID
-#if NO_X11
- return;
-#else
X_LOCK;
@@ -1540,6 +1542,8 @@ int get_which_cursor(void) {
XSetErrorHandler(old_handler);
X_UNLOCK;
trapped_xerror = 0;
+#else
+ if (!r || !d || !bw || !h || !w || !y || !x || !ratio || !old_handler) {}
#endif /* NO_X11 */
}
if (which == which0) {
@@ -1895,6 +1899,8 @@ int check_x11_pointer(void) {
&win_x, &win_y, &mask);
X_UNLOCK;
}
+#else
+ if (!mask || !win_y || !win_x || !child_w || !root_w) {}
#endif /* NO_X11 */
if (0) fprintf(stderr, "check_x11_pointer %d %d\n", root_x, root_y);