Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/84b8e7dfa12455118187f0b8d352461f886bc3aa
...commit
http://git.netsurf-browser.org/netsurf.git/commit/84b8e7dfa12455118187f0b8d352461f886bc3aa
...tree
http://git.netsurf-browser.org/netsurf.git/tree/84b8e7dfa12455118187f0b8d352461f886bc3aa
The branch, master has been updated
via 84b8e7dfa12455118187f0b8d352461f886bc3aa (commit)
from e14a6598be6c8c3ab2071422abd3cf92ec8801fb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=84b8e7dfa12455118187f0b8d352461f886bc3aa
commit 84b8e7dfa12455118187f0b8d352461f886bc3aa
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Duktape: Hopefully silence issue with %lld
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/handlers/javascript/duktape/duk_custom.h
b/content/handlers/javascript/duktape/duk_custom.h
index 2ff9317..b373719 100644
--- a/content/handlers/javascript/duktape/duk_custom.h
+++ b/content/handlers/javascript/duktape/duk_custom.h
@@ -36,3 +36,5 @@
extern duk_bool_t dukky_check_timeout(void *udata);
#define DUK_USE_EXEC_TIMEOUT_CHECK dukky_check_timeout
+
+#include "netsurf/inttypes.h"
diff --git a/content/handlers/javascript/duktape/duktape.c
b/content/handlers/javascript/duktape/duktape.c
index d6a4e31..91c4e65 100644
--- a/content/handlers/javascript/duktape/duktape.c
+++ b/content/handlers/javascript/duktape/duktape.c
@@ -35547,7 +35547,8 @@ DUK_LOCAL void duk__enc_fastint_tval(duk_json_enc_ctx
*js_ctx, duk_tval *tv) {
* "long long" type exists. Could also rely on C99 directly but that
* won't work for older MSVC.
*/
- DUK_SPRINTF((char *) buf, "%lld", (long long) v);
+ /*DUK_SPRINTF((char *) buf, "%lld", (long long) v);*/
+ DUK_SPRINTF((char *) buf, "%"PRIsizet, (size_t) v);
DUK__EMIT_CSTR(js_ctx, (const char *) buf);
}
#endif
-----------------------------------------------------------------------
Summary of changes:
content/handlers/javascript/duktape/duk_custom.h | 2 ++
content/handlers/javascript/duktape/duktape.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/content/handlers/javascript/duktape/duk_custom.h
b/content/handlers/javascript/duktape/duk_custom.h
index 2ff9317..b373719 100644
--- a/content/handlers/javascript/duktape/duk_custom.h
+++ b/content/handlers/javascript/duktape/duk_custom.h
@@ -36,3 +36,5 @@
extern duk_bool_t dukky_check_timeout(void *udata);
#define DUK_USE_EXEC_TIMEOUT_CHECK dukky_check_timeout
+
+#include "netsurf/inttypes.h"
diff --git a/content/handlers/javascript/duktape/duktape.c
b/content/handlers/javascript/duktape/duktape.c
index d6a4e31..91c4e65 100644
--- a/content/handlers/javascript/duktape/duktape.c
+++ b/content/handlers/javascript/duktape/duktape.c
@@ -35547,7 +35547,8 @@ DUK_LOCAL void duk__enc_fastint_tval(duk_json_enc_ctx
*js_ctx, duk_tval *tv) {
* "long long" type exists. Could also rely on C99 directly but that
* won't work for older MSVC.
*/
- DUK_SPRINTF((char *) buf, "%lld", (long long) v);
+ /*DUK_SPRINTF((char *) buf, "%lld", (long long) v);*/
+ DUK_SPRINTF((char *) buf, "%"PRIsizet, (size_t) v);
DUK__EMIT_CSTR(js_ctx, (const char *) buf);
}
#endif
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
