diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-26 20:22:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 20:22:48 +0100 |
| commit | 1ec8b9fb7dfaa074b1f6c2017790f65ca24fa88c (patch) | |
| tree | 5d4425e514de01a7a140a3eba25b9aad7e16708b /platform/x11/os_x11.cpp | |
| parent | ca805744fba0662397ecdcda4e552990a81adfcb (diff) | |
| parent | 0a2c387d5c375aa9dd9e828f100ab55deb8dac72 (diff) | |
| download | redot-engine-1ec8b9fb7dfaa074b1f6c2017790f65ca24fa88c.tar.gz | |
Merge pull request #7851 from shlomif/fix-some-compilation-warnings
Get rid of some compilation warnings.
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 27df280927..a4ed08f330 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1241,7 +1241,7 @@ static Property read_property(Display* p_display, Window p_window, Atom p_proper }while(bytes_after != 0); - Property p = {ret, actual_format, nitems, actual_type}; + Property p = {ret, actual_format, (int)nitems, actual_type}; return p; } |