From a27074fc473cafc1f7179da0bfac98e6da1e7449 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Wed, 25 Jan 2012 13:26:10 +0000
Subject: Revert "Some fixes for compiling with Visual Studio - void* and
 inline"

This reverts commit ea619f554259d746a82c2abf45e5734f637ed041.

diff --git a/src/graphics.c b/src/graphics.c
index b476cf1..aa72139 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -888,7 +888,7 @@ inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
 }
 
 #if defined(WIN32) && !defined(__GNUC__)
-int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
+_inline int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
 #else
 inline int addchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
 #endif
diff --git a/src/luaconsole.c b/src/luaconsole.c
index c9291ae..65bda4d 100644
--- a/src/luaconsole.c
+++ b/src/luaconsole.c
@@ -1168,9 +1168,9 @@ int luatpt_set_property(lua_State* l)
 				}
 				i = r>>8;
 				if(format==2){
-					*((float*)(((char*)&parts[i])+offset)) = f;
+					*((float*)(((void*)&parts[i])+offset)) = f;
 				} else {
-					*((int*)(((char*)&parts[i])+offset)) = t;
+					*((int*)(((void*)&parts[i])+offset)) = t;
 				}
 			}
 	} else {
@@ -1192,9 +1192,9 @@ int luatpt_set_property(lua_State* l)
 		if (partsel && partsel != parts[i].type)
 			return 0;
 		if(format==2){
-			*((float*)(((char*)&parts[i])+offset)) = f;
+			*((float*)(((void*)&parts[i])+offset)) = f;
 		} else {
-			*((int*)(((char*)&parts[i])+offset)) = t;
+			*((int*)(((void*)&parts[i])+offset)) = t;
 		}
 	}
 	return 0;
--
cgit v0.9.2-21-gd62e