MDK 编译警告修复

Signed-off-by: yangfasheng <yangfasheng@rt-thread.com>

include/rtgui/rtgui_system.h

@@ -61,7 +61,7 @@ struct rtgui_timer
 };
 typedef struct rtgui_timer rtgui_timer_t;
 
-rtgui_timer_t *rtgui_timer_create(rt_int32_t time, rt_base_t flag, rtgui_timeout_func timeout, void *parameter);
+rtgui_timer_t *rtgui_timer_create(rt_int32_t time, rt_int32_t flag, rtgui_timeout_func timeout, void *parameter);
 void rtgui_timer_destory(rtgui_timer_t *timer);
 
 void rtgui_timer_set_timeout(rtgui_timer_t *timer, rt_int32_t time);

src/dc_rotozoom.c

@@ -84,7 +84,9 @@ typedef struct tColorY
 /*!
 \brief Returns maximum of two numbers a and b.
 */
+#ifndef MAX
 #define MAX(a,b)    (((a) > (b)) ? (a) : (b))
+#endif
 
 /*!
 \brief Number of guard rows added to destination surfaces.

src/font.c

@@ -25,6 +25,7 @@
  */
 #include <rtgui/font.h>
 #include <rtgui/dc.h>
+#include <rtgui/filerw.h>
 
 static rtgui_list_t _rtgui_font_list;
 static struct rtgui_font *rtgui_default_font;

src/font_fnt.c

@@ -330,8 +330,9 @@ struct rtgui_font *rtgui_hz_fnt_font_create(const char* filename, const char* fo
     }
 
     return font;
-#endif
+#else
     return RT_NULL;
+#endif
 }
 
 struct rtgui_font *rtgui_asc_fnt_font_create(const char* filename, const char* font_family, rt_uint8_t font_size)

src/gb2312.c

@@ -2237,14 +2237,10 @@ void UTF_8ToUnicode(unsigned short* pOut, char *pText)
 
 void UnicodeToGB2312(char* pOut, unsigned short uData)
 {
-    int ret;
-
-    ret = unicode_to_gb2312(uData, (unsigned char *)pOut, (unsigned char *)(pOut+1));
+    unicode_to_gb2312(uData, (unsigned char *)pOut, (unsigned char *)(pOut+1));
 
     pOut[0] += 0xa0 + 1;
     pOut[1] += 0xa0 + 1;
-
-    return;
 }
 
 void Gb2312ToUnicode(unsigned short* pOut, char *pGb2312Word)
@@ -2301,8 +2297,8 @@ void GB2312ToUTF_8(char *pOut,char *pText, int pLen)
     char* rst = pOut;
     int i = 0, j = 0;
 
-    memset(buf, 0, 4);
-    memset(rst, 0, pLen + (pLen >> 2) + 2);
+    rt_memset(buf, 0, 4);
+    rt_memset(rst, 0, pLen + (pLen >> 2) + 2);
 
     while(i < pLen)
     {
@@ -2313,15 +2309,15 @@ void GB2312ToUTF_8(char *pOut,char *pText, int pLen)
         else
         {
             unsigned short pbuffer;
-            unsigned short int tmp = 0;
+//            unsigned short int tmp = 0;
 
             Gb2312ToUnicode(&pbuffer,pText+i);
 
             UnicodeToUTF_8(buf,&pbuffer);
 
-            tmp = rst[j] = buf[0];
-            tmp = rst[j+1] = buf[1];
-            tmp = rst[j+2] = buf[2];
+//            tmp = rst[j] = buf[0];
+//            tmp = rst[j+1] = buf[1];
+//            tmp = rst[j+2] = buf[2];
 
             j += 3;
             i += 2;
@@ -2360,7 +2356,7 @@ void UTF_8ToGB2312(char *pOut, char *pText, int pLen)
     char Ctemp[4];
     int i = 0, j = 0;
 
-    memset(Ctemp, 0, 4);
+    rt_memset(Ctemp, 0, 4);
 
     while(i < pLen)
     {

src/rtgui_system.c

@@ -702,7 +702,7 @@ rt_err_t rtgui_send_sync(struct rtgui_app* app, rtgui_event_t *event, rt_size_t
         goto __return;
     }
 
-    r = rt_mb_recv(&ack_mb, (rt_uint32_t *)&ack_status, RT_WAITING_FOREVER);
+    r = rt_mb_recv(&ack_mb, (rt_ubase_t *)&ack_status, RT_WAITING_FOREVER);
     if (r != RT_EOK)
         goto __return;