|
1 Fix compiler warnings. |
|
2 |
|
3 meta-cursor-renderer.c is already fixed upstream in a later release: |
|
4 https://git.gnome.org/browse/mutter/commit?id=ff312b69585cb0ec9f53483baa47678db8d44306 |
|
5 |
|
6 Other two files need to be submitted upstream still. |
|
7 |
|
8 --- mutter-3.18.0/src/backends/meta-cursor-renderer.c Sun Oct 4 19:47:56 2015 |
|
9 +++ mutter-3.18.0/src/backends/meta-cursor-renderer.c Sun Oct 4 19:48:42 2015 |
|
10 @@ -26,6 +26,7 @@ |
|
11 |
|
12 #include "meta-cursor-renderer.h" |
|
13 |
|
14 +#include <math.h> |
|
15 #include <meta/meta-backend.h> |
|
16 #include <meta/util.h> |
|
17 |
|
18 --- mutter-3.18.0/src/core/window.c Mon Sep 21 12:48:51 2015 |
|
19 +++ mutter-3.18.0/src/core/window.c Tue Jan 5 13:34:16 2016 |
|
20 @@ -3488,7 +3488,7 @@ |
|
21 { |
|
22 MetaMonitorInfo *info = &window->screen->monitor_infos[i]; |
|
23 |
|
24 - if (info->winsys_id == winsys_id) |
|
25 + if ((size_t)info->winsys_id == winsys_id) |
|
26 return info; |
|
27 } |
|
28 |
|
29 @@ -3697,7 +3697,7 @@ |
|
30 |
|
31 meta_window_update_monitor (window, flags & META_MOVE_RESIZE_USER_ACTION); |
|
32 |
|
33 - if (old_output_winsys_id != window->monitor->winsys_id && |
|
34 + if (old_output_winsys_id != (size_t) window->monitor->winsys_id && |
|
35 flags & META_MOVE_RESIZE_MOVE_ACTION && flags & META_MOVE_RESIZE_USER_ACTION) |
|
36 window->preferred_output_winsys_id = window->monitor->winsys_id; |
|
37 |
|
38 --- mutter-3.18.1/src/x11/session.c Tue Jan 5 13:40:50 2016 |
|
39 +++ mutter-3.18.1/src/x11/session.c Tue Jan 5 13:41:09 2016 |
|
40 @@ -336,7 +336,7 @@ |
|
41 prop3val.value = &hint; |
|
42 prop3val.length = 1; |
|
43 |
|
44 - sprintf (pid, "%d", getpid ()); |
|
45 + sprintf (pid, "%ld", (long)getpid ()); |
|
46 prop4.name = (char *)SmProcessID; |
|
47 prop4.type = (char *)SmARRAY8; |
|
48 prop4.num_vals = 1; |