gistfile1.txt

diff --git a/msm8960/common.mk b/msm8960/common.mk
index 0a4cd99..097730a 100644
--- a/msm8960/common.mk
+++ b/msm8960/common.mk
@@ -14,7 +14,7 @@ common_libs := liblog libutils libcutils libhardware
 
 #Common C flags
 common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
-common_flags += -Werror -Wno-unused-parameter
+common_flags += -Wno-unused-parameter -fno-permissive
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
     common_flags += -D__ARM_HAVE_NEON
diff --git a/msm8960/libgralloc/ionalloc.cpp b/msm8960/libgralloc/ionalloc.cpp
index 3d7664e..9b16b12 100644
--- a/msm8960/libgralloc/ionalloc.cpp
+++ b/msm8960/libgralloc/ionalloc.cpp
@@ -197,7 +197,7 @@ int IonAlloc::clean_buffer(void *base, size_t size, int offset, int fd, int op)
     }
 
     handle_data.handle = fd_data.handle;
-    flush_data.handle  = fd_data.handle;
+    flush_data.handle  = (ion_handle *)fd_data.handle;
     flush_data.vaddr   = base;
     flush_data.offset  = offset;
     flush_data.length  = size;