diff options
| author | Ben Cheng <bccheng@google.com> | 2013-03-18 18:42:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-18 18:42:34 +0000 |
| commit | 0b60f1f486f68eb45a08afba8e6cc5068935edf1 (patch) | |
| tree | 3324828f960072c14a2175cfc9d10963bec8f370 | |
| parent | 7033730f508f5046771e4a768f8d24e825ac1cd7 (diff) | |
| parent | 1ec95f8f26bf31c28aa8e99707e129a088335c8a (diff) | |
| download | quake-0b60f1f486f68eb45a08afba8e6cc5068935edf1.tar.gz | |
Merge "Add (void *) to make gcc 4.7 happy under strict-alias mode."
| -rw-r--r-- | quake/src/WinQuake/pr_exec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quake/src/WinQuake/pr_exec.cpp b/quake/src/WinQuake/pr_exec.cpp index 2af657a..596454e 100644 --- a/quake/src/WinQuake/pr_exec.cpp +++ b/quake/src/WinQuake/pr_exec.cpp @@ -577,7 +577,7 @@ while (1) #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 @@ while (1) #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]; |