From 5dc4feb086d5b40c1e94b6f34c013e9e82a7b178 Mon Sep 17 00:00:00 2001
From: yang <yang.zhang@arm.com>
Date: Wed, 19 Sep 2012 16:01:02 +0800
Subject: [PATCH] remove the compile warnings

---
 common/factor.h     | 56 ++++++++++++++++++++++++++---------------------------
 modules/NE10_init.c |  1 +
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/common/factor.h b/common/factor.h
index 30f218f..d05f0d9 100644
--- a/common/factor.h
+++ b/common/factor.h
@@ -72,41 +72,41 @@
 // A few macros to check pointers and their address range to make sure there's
 //  no unwanted overlap between any two of them
 #define NE10_CHECKPOINTER_DstSrcCst_OPERATION \
-   if ( dst < src ) \
-    { assert ( dst + count <= src ); } \
-   else if ( dst > src ) \
-    { assert ( src + count <= dst ); }
+   if ( (void *)dst < (void *)src ) \
+    { assert ( (void *)dst + count <= (void *)src ); } \
+   else if ( (void *)dst > (void *)src ) \
+    { assert ( (void *)src + count <= (void *)dst ); }
 
 #define NE10_CHECKPOINTER_DstSrc_OPERATION NE10_CHECKPOINTER_DstSrcCst_OPERATION
 
 #define NE10_CHECKPOINTER_3POINTER_OPERATION(arg1, arg2, arg3) \
-   if ( arg1 < arg2 ) \
-    { assert ( arg1 + count <= arg2 ); } \
-   else if ( arg1 > arg2 ) \
-    { assert ( arg2 + count <= arg1 ); } \
-   if ( arg1 < arg3 ) \
-    { assert ( arg1 + count <= arg3 ); } \
-   else if ( arg1 > arg3 ) \
-    { assert ( arg3 + count <= arg1 ); } \
-   if ( arg3 < arg2 ) \
-    { assert ( arg3 + count <= arg2 ); } \
-   else if ( arg3 > arg2 ) \
-    { assert ( arg2 + count <= arg3 ); }
+   if ( (void *)arg1 < (void *)arg2 ) \
+    { assert ( (void *)arg1 + count <= (void *)arg2 ); } \
+   else if ( (void *)arg1 > (void *)arg2 ) \
+    { assert ( (void *)arg2 + count <= (void *)arg1 ); } \
+   if ( (void *)arg1 < (void *)arg3 ) \
+    { assert ( (void *)arg1 + count <= (void *)arg3 ); } \
+   else if ( (void *)arg1 > (void *)arg3 ) \
+    { assert ( (void *)arg3 + count <= (void *)arg1 ); } \
+   if ( (void *)arg3 < (void *)arg2 ) \
+    { assert ( (void *)arg3 + count <= (void *)arg2 ); } \
+   else if ( (void *)arg3 > (void *)arg2 ) \
+    { assert ( (void *)arg2 + count <= (void *)arg3 ); }
 
 #define NE10_CHECKPOINTER_4POINTER_OPERATION(arg1, arg2, arg3, arg4) \
    NE10_CHECKPOINTER_3POINTER_OPERATION(arg1, arg2, arg3) \
-   if ( arg1 < arg4 ) \
-    { assert ( arg1 + count <= arg4 ); } \
-   else if ( arg1 > arg4 ) \
-    { assert ( arg4 + count <= arg1 ); } \
-   if ( arg2 < arg4 ) \
-    { assert ( arg2 + count <= arg4 ); } \
-   else if ( arg2 > arg4 ) \
-    { assert ( arg4 + count <= arg2 ); } \
-   if ( arg4 < arg3 ) \
-    { assert ( arg4 + count <= arg3 ); } \
-   else if ( arg4 > arg3 ) \
-    { assert ( arg3 + count <= arg4 ); }
+   if ( (void *)arg1 < (void *)arg4 ) \
+    { assert ( (void *)arg1 + count <= (void *)arg4 ); } \
+   else if ( (void *)arg1 > (void *)arg4 ) \
+    { assert ( (void *)arg4 + count <= (void *)arg1 ); } \
+   if ( (void *)arg2 < (void *)arg4 ) \
+    { assert ( (void *)arg2 + count <= (void *)arg4 ); } \
+   else if ( (void *)arg2 > (void *)arg4 ) \
+    { assert ( (void *)arg4 + count <= (void *)arg2 ); } \
+   if ( (void *)arg4 < (void *)arg3 ) \
+    { assert ( (void *)arg4 + count <= (void *)arg3 ); } \
+   else if ( (void *)arg4 > (void *)arg3 ) \
+    { assert ( (void *)arg3 + count <= (void *)arg4 ); }
 
 
 
diff --git a/modules/NE10_init.c b/modules/NE10_init.c
index b81c2de..be6ab83 100644
--- a/modules/NE10_init.c
+++ b/modules/NE10_init.c
@@ -17,6 +17,7 @@
 #include "NE10.h"
 
 #include <stdio.h>
+#include <string.h>
 
 #define CPUINFO_BUFFER_SIZE  (1024*4)
 
-- 
2.7.4