You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/08/11 06:25:48 UTC
[incubator-nuttx-apps] branch master updated: interpreters/duktape:
Fix build warning for sim on macOS
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new a6674b6 interpreters/duktape: Fix build warning for sim on macOS
a6674b6 is described below
commit a6674b6edc7967634434caaee8772241038b764c
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Sat Aug 8 15:39:01 2020 +0800
interpreters/duktape: Fix build warning for sim on macOS
Signed-off-by: Huang Qi <hu...@xiaomi.com>
Change-Id: Iecfdb1dee2060d2f0f0a2dc8dce3d239af8ee273
---
interpreters/duktape/duk_cmdline.patch | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/interpreters/duktape/duk_cmdline.patch b/interpreters/duktape/duk_cmdline.patch
index 04f4b3b..e265c18 100644
--- a/interpreters/duktape/duk_cmdline.patch
+++ b/interpreters/duktape/duk_cmdline.patch
@@ -1,7 +1,16 @@
diff --color -ur duktape-2.5.0/examples/cmdline/duk_cmdline.c duktape-2.5.0-modifed/examples/cmdline/duk_cmdline.c
--- duktape-2.5.0/examples/cmdline/duk_cmdline.c 2019-11-25 06:04:27.000000000 +0800
+++ duktape-2.5.0-modifed/examples/cmdline/duk_cmdline.c 2020-08-07 23:20:27.320000000 +0800
-@@ -810,6 +810,8 @@
+@@ -103,7 +103,7 @@
+ #define MEM_LIMIT_NORMAL (128*1024*1024) /* 128 MB */
+ #define MEM_LIMIT_HIGH (2047*1024*1024) /* ~2 GB */
+-#define LINEBUF_SIZE 65536
++#define LINEBUF_SIZE 256
+
+ static int main_argc = 0;
+ static char **main_argv = NULL;
+
+@@ -810,10 +810,12 @@
for (;;) {
int c = fgetc(stdin);
@@ -10,10 +19,24 @@ diff --color -ur duktape-2.5.0/examples/cmdline/duk_cmdline.c duktape-2.5.0-modi
if (c == EOF) {
got_eof = 1;
break;
+- } else if (c == '\n') {
++ } else if (c == '\n' || c == '\r') {
+ break;
+ } else if (idx >= LINEBUF_SIZE) {
+ fprintf(stderr, "line too long\n");
diff --color -ur duktape-2.5.0/src-noline/duk_config.h duktape-2.5.0-modifed/src-noline/duk_config.h
--- duktape-2.5.0/src-noline/duk_config.h 2019-11-25 06:04:27.000000000 +0800
+++ duktape-2.5.0-modifed/src-noline/duk_config.h 2020-08-07 23:14:55.880000000 +0800
+@@ -402,7 +402,7 @@
+ /* --- Mac OSX, iPhone, Darwin --- */
+ #define DUK_USE_DATE_NOW_GETTIMEOFDAY
+ #define DUK_USE_DATE_TZO_GMTIME_R
+-#define DUK_USE_DATE_PRS_STRPTIME
++#undef DUK_USE_DATE_PRS_STRPTIME
+ #define DUK_USE_DATE_FMT_STRFTIME
+ #include <TargetConditionals.h>
+ #include <architecture/byte_order.h>
@@ -746,7 +746,7 @@
#define DUK_USE_DATE_NOW_GETTIMEOFDAY