summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-04 20:45:15 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-05 00:21:16 +0300
commitaf2f4f8ab50a209502b929082b11a7a07e6c5499 (patch)
tree4ad3e2efb564fd523deb5a0925941bf4abac319a /src/utils
parentb90595ef486f10d4b5e069e9363a2df5270fe717 (diff)
downloadManaVerse-af2f4f8ab50a209502b929082b11a7a07e6c5499.tar.gz
ManaVerse-af2f4f8ab50a209502b929082b11a7a07e6c5499.tar.bz2
ManaVerse-af2f4f8ab50a209502b929082b11a7a07e6c5499.tar.xz
ManaVerse-af2f4f8ab50a209502b929082b11a7a07e6c5499.zip
Fix code style.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/glxhelper.cpp6
-rw-r--r--src/utils/glxhelper.h8
2 files changed, 6 insertions, 8 deletions
diff --git a/src/utils/glxhelper.cpp b/src/utils/glxhelper.cpp
index 1624b6309..bd50d8c61 100644
--- a/src/utils/glxhelper.cpp
+++ b/src/utils/glxhelper.cpp
@@ -36,7 +36,7 @@ static int ErrorHandler(Display *d A_UNUSED, XErrorEvent *e A_UNUSED)
return 0;
}
-void *GlxHelper::createContext(const unsigned int window,
+void *GlxHelper::createContext(const unsigned long window,
void *const display0,
const int major,
const int minor)
@@ -61,7 +61,7 @@ void *GlxHelper::createContext(const unsigned int window,
XSetErrorHandler(handler);
return context;
}
- int glxAttribs[] =
+ int glxAttribs[] =
{
GLX_RENDER_TYPE, GLX_RGBA_BIT,
GLX_RED_SIZE, 3,
@@ -117,7 +117,7 @@ void *GlxHelper::createContext(const unsigned int window,
return context2;
}
-bool GlxHelper::makeCurrent(const unsigned int window,
+bool GlxHelper::makeCurrent(const unsigned long window,
void *const display,
void *const context)
{
diff --git a/src/utils/glxhelper.h b/src/utils/glxhelper.h
index ce3a5568d..528e3f7fb 100644
--- a/src/utils/glxhelper.h
+++ b/src/utils/glxhelper.h
@@ -27,19 +27,17 @@
#include "localconsts.h"
-//struct Display;
-
namespace GlxHelper
{
- void *createContext(const unsigned int window,
+ void *createContext(const unsigned long window,
void *const display,
const int major,
const int minor);
- bool makeCurrent(const unsigned int window,
+ bool makeCurrent(const unsigned long window,
void *const display,
void *const context);
-} // namespace Glx
+} // namespace GlxHelper
#endif // defined(USE_OPENGL) && defined(USE_X11)
#endif // UTILS_GLXHELPER_H