From 8dbfbc670b5dee765b72c13c090685881d4e68d2 Mon Sep 17 00:00:00 2001 From: psperl Date: Mon, 7 Dec 2009 04:45:38 +0000 Subject: [PATCH] win32 fixes git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1326 6778bc44-b910-0410-a7a0-be141de4315d --- src/libprojectM/Renderer/TextureManager.cpp | 4 ++-- src/libprojectM/win32-dirent.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp index 47c852aa6..ba6db22e0 100644 --- a/src/libprojectM/Renderer/TextureManager.cpp +++ b/src/libprojectM/Renderer/TextureManager.cpp @@ -59,7 +59,7 @@ void TextureManager::Preload() ilLoadL(IL_TYPE_UNKNOWN,(ILvoid*) M_data, M_bytes); GLuint tex = ilutGLBindTexImage(); #else - uint tex = SOIL_load_OGL_texture_from_memory( + unsigned int tex = SOIL_load_OGL_texture_from_memory( M_data, M_bytes, SOIL_LOAD_AUTO, @@ -173,7 +173,7 @@ GLuint TextureManager::getTextureFullpath(const std::string filename, const std: #else int width, height; - uint tex = SOIL_load_OGL_texture_size( + unsigned int tex = SOIL_load_OGL_texture_size( imageURL.c_str(), SOIL_LOAD_AUTO, SOIL_CREATE_NEW_ID, diff --git a/src/libprojectM/win32-dirent.h b/src/libprojectM/win32-dirent.h index 7893d0bc4..1b6f9a624 100755 --- a/src/libprojectM/win32-dirent.h +++ b/src/libprojectM/win32-dirent.h @@ -19,7 +19,7 @@ extern "C" typedef struct DIR DIR; -static int errno; +//static int errno; struct dirent {