Merge pull request #1826 from eehrich/master

Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
This commit is contained in:
Juan Linietsky
2015-05-07 20:02:54 -03:00
23 changed files with 50 additions and 45 deletions

View File

@@ -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);