From 93186fb6408d26a31368eb67ae67fe014f74b1bd Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Thu, 29 Oct 2009 04:28:57 +0000
Subject: [PATCH] fix pedantic gcc compile errors

---
 desmume/src/OGLRender.cpp | 2 +-
 desmume/src/texcache.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp
index 71542753a..87d6d173c 100644
--- a/desmume/src/OGLRender.cpp
+++ b/desmume/src/OGLRender.cpp
@@ -562,7 +562,7 @@ static void setTexture(unsigned int format, unsigned int texpal)
 		{
 			currTexture->deleteCallback = texDeleteCallback;
 			if(freeTextureIds.empty()) expandFreeTextures();
-			currTexture->texid = (void*)freeTextureIds.front();
+			currTexture->texid = (u32)freeTextureIds.front();
 			freeTextureIds.pop();
 
 			glBindTexture(GL_TEXTURE_2D,(GLuint)currTexture->texid);
diff --git a/desmume/src/texcache.h b/desmume/src/texcache.h
index 8f1fe6b74..f55933be1 100644
--- a/desmume/src/texcache.h
+++ b/desmume/src/texcache.h
@@ -44,7 +44,7 @@ public:
 	u32 sizeX, sizeY;
 	float invSizeX, invSizeY;
 
-	void* texid; //used by ogl renderer for the texid
+	u32 texid; //used by ogl renderer for the texid
 	void (*deleteCallback)(ADPCMCacheItem*);
 
 	TexCache_TexFormat cacheFormat;