Bernard Xiong 6 лет назад
Родитель
Сommit
4949d70bb4

+ 2 - 0
SConscript

@@ -62,6 +62,8 @@ LOCAL_CCFLAGS = ''
 import rtconfig
 if rtconfig.CROSS_TOOL == 'keil':
     LOCAL_CCFLAGS += ' --gnu'
+elif rtconfig.CROSS_TOOL == 'gcc':
+    LOCAL_CCFLAGS += ' -std=c11'
 
 CPPDEFINES = ['JERRY_JS_PARSER', 'JERRY_ENABLE_EXTERNAL_CONTEXT']
 

+ 8 - 5
rtthread-port/jerry_buffer.c

@@ -95,8 +95,8 @@ static DECL_FUNC_ARGS(jerry_buffer_read_bytes, int bytes, bool big_endian, bool
     if (!big_endian)
         offset += bytes - 1;  // start on the big end
 
-    uint32_t value = 0;
-    for (int i = 0; i < bytes; i++)
+    uint32_t value = 0, i;
+    for (i = 0; i < bytes; i++)
     {
         value <<= 8;
         value |= buf->buffer[offset];
@@ -160,7 +160,8 @@ static DECL_FUNC_ARGS(jerry_buffer_write_bytes, int bytes, bool big_endian)
     if (big_endian)
         offset += bytes - 1;  // start on the little end
 
-    for (int i = 0; i < bytes; i++)
+	int i;
+    for (i = 0; i < bytes; i++)
     {
         buf->buffer[offset] = value & 0xff;
         value >>= 8;
@@ -360,9 +361,10 @@ DECLARE_HANDLER(toString)
             char *hexbuf = malloc(size * 2 + 1);
             if (hexbuf)
             {
+				int i;
                 jerry_value_t ret;
 
-                for (int i = 0; i < size; i++)
+                for (i = 0; i < size; i++)
                 {
                     int high = (0xf0 & buf->buffer[i + start]) >> 4;
                     int low = 0xf & buf->buffer[i + start];
@@ -874,7 +876,8 @@ DECLARE_HANDLER(Buffer)
         jerry_value_t new_buf = jerry_buffer_create(len, &buf);
         if (buf)
         {
-            for (int i = 0; i < len; i++)
+			int i;
+            for (i = 0; i < len; i++)
             {
                 jerry_value_t item = jerry_get_property_by_index(array, i);
                 if (jerry_value_is_number(item))

+ 2 - 1
rtthread-port/jerry_console.c

@@ -8,7 +8,8 @@
 
 DECLARE_HANDLER(dir)
 {
-    for (int index = 0; index < args_cnt; index ++)
+	int index;
+    for (index = 0; index < args_cnt; index ++)
     {
         js_value_dump(args[index]);
         printf("\n");

+ 5 - 2
rtthread-port/jerry_net.c

@@ -488,6 +488,7 @@ void net_socket_readData(jerry_value_t js_socket)
 
 void net_socket_sendData(net_writeInfo_t *write_info, jerry_value_t js_socket)
 {
+	int bytes;
     unsigned char buffer[BUFFER_SIZE];
     memset(&buffer, 0, BUFFER_SIZE);
     /*send the data*/
@@ -500,7 +501,8 @@ void net_socket_sendData(net_writeInfo_t *write_info, jerry_value_t js_socket)
 
     if (js_buffer)
     {
-        for (int i = 0, bytes = js_buffer->bufsize; bytes > 0; i++, bytes -= BUFFER_SIZE)
+		int i;
+        for (i = 0, bytes = js_buffer->bufsize; bytes > 0; i++, bytes -= BUFFER_SIZE)
         {
             memset(&buffer, 0, BUFFER_SIZE);
 
@@ -518,8 +520,9 @@ void net_socket_sendData(net_writeInfo_t *write_info, jerry_value_t js_socket)
     }
     else if (jerry_value_is_string(write_info->js_data))
     {
+		int i;
         char *js_str = js_value_to_string(write_info->js_data);
-        for (int i = 0, bytes = strlen(js_str); bytes > 0; i++, bytes -= BUFFER_SIZE)
+        for (i = 0, bytes = strlen(js_str); bytes > 0; i++, bytes -= BUFFER_SIZE)
         {
             memset(&buffer, 0, BUFFER_SIZE);
 

+ 2 - 1
rtthread-port/jerry_util.c

@@ -7,7 +7,8 @@
 #include "jerry_util.h"
 #include <jerry_event.h>
 #include <jerry_message.h>
-#include <rtgui/gb2312.h>
+
+// #include <rtgui/gb2312.h>
 
 extern int js_console_init(void);
 extern int js_module_init(void);