diff options
| author | Ben Cheng <bccheng@google.com> | 2012-12-21 10:15:17 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-21 10:15:18 -0800 |
| commit | c12c344ddffba520a28a19f2fe5a6aafe70b4b56 (patch) | |
| tree | 6601e850bf0cf35c83af12f54e694682b2c115c1 | |
| parent | d6da0b3e4c4dc9a66ff53ccc43739bf584c37efb (diff) | |
| parent | adec81f102a252bdc97a500d07e211fc0e602c47 (diff) | |
| download | quake-c12c344ddffba520a28a19f2fe5a6aafe70b4b56.tar.gz | |
Merge "[DO NOT MERGE] Add (void *) to make gcc 4.7 happy under strict-alias mode."jb-mr1-dev-plus-aosp
| -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..39ce86c 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]; |