summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/graphicsmanager.h2
-rw-r--r--src/resources/resourcemanager.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index 450040eed..ab69a0cc6 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -24,14 +24,12 @@
#include "main.h"
#ifdef USE_OPENGL
-#ifndef WIN32
#define GL_GLEXT_PROTOTYPES 1
#include <SDL_opengl.h>
// hack to hide warnings
#undef GL_GLEXT_VERSION
#undef GL_GLEXT_PROTOTYPES
#endif
-#endif
#include <set>
#include <string>
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 71b5e9a1d..b6befb491 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -271,9 +271,10 @@ void ResourceManager::clearDeleted()
if (!(*resDelIter)->getRefCount())
{
status = true;
- logResource(*resDelIter);
+ Resource *res = *resDelIter;
+ logResource(res);
mDeletedResources.erase(resDelIter);
- delete *resDelIter;
+ delete res;
break;
}
++ resDelIter;