commit 6a1cdaaad5d096c75895d99556bc2e9c6a2e7219
author Ben Cheng <bccheng@google.com> Fri Dec 28 09:47:17 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 28 09:47:17 2012 -0800
tree 6601e850bf0cf35c83af12f54e694682b2c115c1
parent 494ce1fc7f0cee59bf1cc0281c2e558aab15aed7
parent 7033730f508f5046771e4a768f8d24e825ac1cd7

am 7033730f: (-s ours) am 72a102cd: (-s ours) am c12c344d: (-s ours) Merge "[DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode."

* commit '7033730f508f5046771e4a768f8d24e825ac1cd7':
  [DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode.

quake/src/WinQuake/pr_exec.cpp

diff --git a/quake/src/WinQuake/pr_exec.cpp b/quake/src/WinQuake/pr_exec.cpp
index 2af657a..39ce86c 100644
--- a/quake/src/WinQuake/pr_exec.cpp
+++ b/quake/src/WinQuake/pr_exec.cpp
@@ -577,7 +577,7 @@
 #ifdef PARANOID
 		NUM_FOR_EDICT(ed);		// make sure it's in range
 #endif
-		a = (eval_t *)(ed->u.i + b->_int);
+		a = (eval_t *)((void *)(ed->u.i + b->_int));
 		c->_int = a->_int;
 		break;
 
@@ -586,7 +586,7 @@
 #ifdef PARANOID
 		NUM_FOR_EDICT(ed);		// make sure it's in range
 #endif
-		a = (eval_t *)(ed->u.i + b->_int);
+		a = (eval_t *)((void *)(ed->u.i + b->_int));
 		c->vector[0] = a->vector[0];
 		c->vector[1] = a->vector[1];
 		c->vector[2] = a->vector[2];