Merge f16e31970b into 4521389404
This commit is contained in:
Derek "Turtle" Roe
GitHub
commit
5a23336f97
|
|
@ -68,6 +68,8 @@ and agreed to irrevocably license their contributions under the Duktape
|
|||
* Maurici Abad (https://github.com/mauriciabad)
|
||||
* Nancy Li (https://github.com/NancyLi1013)
|
||||
* William Parks (https://github.com/WilliamParks)
|
||||
* Sam Hellawell (https://github.com/samhellawell)
|
||||
* Vladislavs Sokurenko (https://github.com/sokurenko)
|
||||
|
||||
Other contributions
|
||||
===================
|
||||
|
|
@ -112,4 +114,4 @@ bugs, provided ideas, etc; roughly in order of appearance):
|
|||
* Karl Dahlke (eklhad@gmail.com)
|
||||
|
||||
If you are accidentally missing from this list, send me an e-mail
|
||||
(``sami.vaarala@iki.fi``) and I'll fix the omission.
|
||||
(``sami.vaarala@iki.fi``) and I'll fix the omission.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
The MIT License (MIT)
|
||||
===============
|
||||
Duktape license
|
||||
===============
|
||||
|
||||
Copyright (c) 2013-present, Duktape authors (see AUTHORS.rst)
|
||||
(http://opensource.org/licenses/MIT)
|
||||
|
||||
Copyright (c) 2013-present by Duktape authors (see AUTHORS.rst)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -18,4 +22,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
THE SOFTWARE.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/*
|
||||
* duk_config.h configuration header generated by genconfig.py.
|
||||
*
|
||||
* Git commit: fffa346eff06a8764b02c31d4336f63a773a95c3
|
||||
* Git describe: v2.6.0
|
||||
* Git branch: v2-maintenance
|
||||
* Git commit: 03d4d728f8365021de6955c649e6dcd05dcca99f
|
||||
* Git describe: 03d4d72-dirty
|
||||
* Git branch: HEAD
|
||||
*
|
||||
* Supported platforms:
|
||||
* - Mac OSX, iPhone, Darwin
|
||||
|
|
@ -3097,17 +3097,6 @@ typedef struct duk_hthread duk_context;
|
|||
|
||||
/* __OVERRIDE_DEFINES__ */
|
||||
|
||||
#if defined(DUK_USE_DATE_NOW_WINDOWS_SUBMS)
|
||||
#undef DUK_USE_DATE_NOW_WINDOWS_SUBMS
|
||||
#define DUK_USE_DATE_NOW_WINDOWS
|
||||
#endif
|
||||
|
||||
#define DUK_USE_CPP_EXCEPTIONS
|
||||
#define DUK_USE_INTERRUPT_COUNTER
|
||||
#define DUK_USE_EXEC_TIMEOUT_CHECK(udata) DukTimeoutCheck(udata)
|
||||
|
||||
extern "C" int DukTimeoutCheck(void*);
|
||||
|
||||
/*
|
||||
* Conditional includes
|
||||
*/
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,13 +1,13 @@
|
|||
/*
|
||||
* Duktape public API for Duktape 2.6.0.
|
||||
* Duktape public API for Duktape 2.7.0.
|
||||
*
|
||||
* See the API reference for documentation on call semantics. The exposed,
|
||||
* supported API is between the "BEGIN PUBLIC API" and "END PUBLIC API"
|
||||
* comments. Other parts of the header are Duktape internal and related to
|
||||
* e.g. platform/compiler/feature detection.
|
||||
*
|
||||
* Git commit fffa346eff06a8764b02c31d4336f63a773a95c3 (v2.6.0).
|
||||
* Git branch v2-maintenance.
|
||||
* Git commit 03d4d728f8365021de6955c649e6dcd05dcca99f (03d4d72-dirty).
|
||||
* Git branch HEAD.
|
||||
*
|
||||
* See Duktape AUTHORS.rst and LICENSE.txt for copyright and
|
||||
* licensing information.
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
*
|
||||
* (http://opensource.org/licenses/MIT)
|
||||
*
|
||||
* Copyright (c) 2013-2019 by Duktape authors (see AUTHORS.rst)
|
||||
* Copyright (c) 2013-present by Duktape authors (see AUTHORS.rst)
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -110,6 +110,12 @@
|
|||
* * Luis de Bethencourt (https://github.com/luisbg)
|
||||
* * Ian Whyman (https://github.com/v00d00)
|
||||
* * Rick Sayre (https://github.com/whorfin)
|
||||
* * Craig Leres (https://github.com/leres)
|
||||
* * Maurici Abad (https://github.com/mauriciabad)
|
||||
* * Nancy Li (https://github.com/NancyLi1013)
|
||||
* * William Parks (https://github.com/WilliamParks)
|
||||
* * Sam Hellawell (https://github.com/samhellawell)
|
||||
* * Vladislavs Sokurenko (https://github.com/sokurenko)
|
||||
*
|
||||
* Other contributions
|
||||
* ===================
|
||||
|
|
@ -176,16 +182,16 @@
|
|||
* development snapshots have 99 for patch level (e.g. 0.10.99 would be a
|
||||
* development version after 0.10.0 but before the next official release).
|
||||
*/
|
||||
#define DUK_VERSION 20600L
|
||||
#define DUK_VERSION 20700L
|
||||
|
||||
/* Git commit, describe, and branch for Duktape build. Useful for
|
||||
* non-official snapshot builds so that application code can easily log
|
||||
* which Duktape snapshot was used. Not available in the ECMAScript
|
||||
* environment.
|
||||
*/
|
||||
#define DUK_GIT_COMMIT "fffa346eff06a8764b02c31d4336f63a773a95c3"
|
||||
#define DUK_GIT_DESCRIBE "v2.6.0"
|
||||
#define DUK_GIT_BRANCH "v2-maintenance"
|
||||
#define DUK_GIT_COMMIT "03d4d728f8365021de6955c649e6dcd05dcca99f"
|
||||
#define DUK_GIT_DESCRIBE "03d4d72-dirty"
|
||||
#define DUK_GIT_BRANCH "HEAD"
|
||||
|
||||
/* External duk_config.h provides platform/compiler/OS dependent
|
||||
* typedefs and macros, and DUK_USE_xxx config options so that
|
||||
|
|
|
|||
Loading…
Reference in New Issue