diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-07 20:02:54 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-07 20:02:54 -0300 |
| commit | c99813dc38cc79b37529cdd98dc2bc2c3ff69edc (patch) | |
| tree | 99ea11d3829bf296ea23941a83ebc61158028087 /platform/x11/os_x11.cpp | |
| parent | 7156aff16041ea56ff1f3aea2a622c130bcca7a9 (diff) | |
| parent | ac9263c680076eed36887a681cb59fdcce6c6f73 (diff) | |
Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 67ec33f3a3..28427fa2f0 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -317,8 +317,8 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi /* set the name and class hints for the window manager to use */ classHint = XAllocClassHint(); if (classHint) { - classHint->res_name = "Godot"; - classHint->res_class = "Godot"; + classHint->res_name = (char *)"Godot"; + classHint->res_class = (char *)"Godot"; } XSetClassHint(x11_display, x11_window, classHint); XFree(classHint); |