commit 0d3007afa9ce224e5dffe65382b425c7317ad4f5
author Jack Palevich <jackpal@google.com> Sun Apr 28 13:43:08 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Apr 28 13:43:08 2013 -0700
tree c1a3d30612beaf12677e1055059ce2ef40772392
parent a3c8582020d66ad6a82cd56ea03f2e9dc983cefa
parent 9606b1ec564a35280fe74b36d953c1320fe27d33

am 9606b1ec: Merge "Non-initialized memory usage"

* commit '9606b1ec564a35280fe74b36d953c1320fe27d33':
  Non-initialized memory usage

Android.mk

diff --git a/Android.mk b/Android.mk
index 45e2e91..532ed6e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -95,6 +95,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
 	libutils \
+	liblog \
 	libEGL \
 	libGLESv1_CM \
 	libOpenSLES

quake/src/WinQuake/pr_exec.cpp

diff --git a/quake/src/WinQuake/pr_exec.cpp b/quake/src/WinQuake/pr_exec.cpp
index 596454e..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 *)((void *) (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 *)((void *) (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];