45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
|
The original type is const unsigned char *
|
||
|
|
--- a/xbmc/windowing/X11/WinSystemX11.cpp
|
||
|
|
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
|
||
|
|
@@ -1038,7 +1038,7 @@ bool CWinSystemX11::HasWindowManager()
|
||
|
|
|
||
|
|
if(status == Success && items_read)
|
||
|
|
{
|
||
|
|
- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
|
||
|
|
+ CLog::Log(LOGDEBUG,"Window Manager Name: %s", (char *)data);
|
||
|
|
}
|
||
|
|
else
|
||
|
|
CLog::Log(LOGDEBUG,"Window Manager Name: ");
|
||
|
|
--- a/xbmc/utils/GLUtils.cpp
|
||
|
|
+++ b/xbmc/utils/GLUtils.cpp
|
||
|
|
@@ -152,25 +152,25 @@ void LogGraphicsInfo()
|
||
|
|
|
||
|
|
s = glGetString(GL_VENDOR);
|
||
|
|
if (s)
|
||
|
|
- CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
|
||
|
|
+ CLog::Log(LOGINFO, "GL_VENDOR = %s", (char *)(s));
|
||
|
|
else
|
||
|
|
CLog::Log(LOGINFO, "GL_VENDOR = NULL");
|
||
|
|
|
||
|
|
s = glGetString(GL_RENDERER);
|
||
|
|
if (s)
|
||
|
|
- CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
|
||
|
|
+ CLog::Log(LOGINFO, "GL_RENDERER = %s", (char *)(s));
|
||
|
|
else
|
||
|
|
CLog::Log(LOGINFO, "GL_RENDERER = NULL");
|
||
|
|
|
||
|
|
s = glGetString(GL_VERSION);
|
||
|
|
if (s)
|
||
|
|
- CLog::Log(LOGINFO, "GL_VERSION = %s", s);
|
||
|
|
+ CLog::Log(LOGINFO, "GL_VERSION = %s", (char *)(s));
|
||
|
|
else
|
||
|
|
CLog::Log(LOGINFO, "GL_VERSION = NULL");
|
||
|
|
|
||
|
|
s = glGetString(GL_SHADING_LANGUAGE_VERSION);
|
||
|
|
if (s)
|
||
|
|
- CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
|
||
|
|
+ CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", (char *)(s));
|
||
|
|
else
|
||
|
|
CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = NULL");
|
||
|
|
|