Revert a careless change

Seems I did something wrong with SVN. Revert the changed parts
that should not have been changed.
This commit is contained in:
jean.chalard
2011-07-07 03:41:51 +00:00
parent c5cd81f6a1
commit 93d96fe52b
2 changed files with 5 additions and 5 deletions

View File

@@ -1,6 +1,6 @@
#define GL_GLEXT_PROTOTYPES
#include <QtOpenGL/QtOpenGL>
#include <QtCore/QTime>
#include <QtOpenGL>
#include <QTime>
#ifdef Q_WS_MAEMO_5
// For volume buttons support

View File

@@ -50,8 +50,8 @@ JGameLauncher* g_launcher = NULL;
//------------------------------------------------------------------------
Display* gXDisplay = NULL;
Window gXWindow = (Window)0;
GLXWindow glxWin = (GLXWindow)0;
Window gXWindow = (Window)NULL;
GLXWindow glxWin = (GLXWindow)NULL;
static std::multiset<JButton> gControllerState;
static std::multiset<JButton> gPrevControllerState;
@@ -173,7 +173,7 @@ void KillGLWindow(void) // Properly Kill The Window
{
if (gXWindow && gXDisplay)
XDestroyWindow(gXDisplay, gXWindow);
gXWindow = (Window)0;
gXWindow = (Window)NULL;
}