From 2937b2f8719b724ea1d06117cfd48ade1c946c0e Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Tue, 12 Jan 2016 11:25:30 +0100
Subject: Update to Duktape 1.4.0 release.

---
 javascript/duktape/duk_config.h | 64 ++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

(limited to 'javascript/duktape/duk_config.h')

diff --git a/javascript/duktape/duk_config.h b/javascript/duktape/duk_config.h
index f6ee91cdd..64c10ea79 100644
--- a/javascript/duktape/duk_config.h
+++ b/javascript/duktape/duk_config.h
@@ -1,9 +1,9 @@
 /*
  *  duk_config.h configuration header generated by genconfig.py.
  *
- *  Git commit: b7b1c5fd2d1d4550140d57e05a7b32f540082bfa
- *  Git describe: v1.3.0-383-gb7b1c5f
- *  Git branch: duk-config-improvements
+ *  Git commit: cad6f595382a0cc1a7e4207794ade5be11b3e397
+ *  Git describe: v1.4.0
+ *  Git branch: master
  *
  *  Supported platforms:
  *      - Mac OSX, iPhone, Darwin
@@ -199,6 +199,12 @@
 #define DUK_F_NO_STDINT_H
 #endif
 
+/* C++ */
+#undef DUK_F_CPP
+#if defined(__cplusplus)
+#define DUK_F_CPP
+#endif
+
 /* Intel x86 (32-bit), x64 (64-bit) or x32 (64-bit but 32-bit pointers),
  * define only one of DUK_F_X86, DUK_F_X64, DUK_F_X32.
  * https://sites.google.com/site/x32abi/
@@ -273,12 +279,6 @@
 #define DUK_F_CLANG
 #endif
 
-/* C++ */
-#undef DUK_F_CPP
-#if defined(__cplusplus)
-#define DUK_F_CPP
-#endif
-
 /* C99 or above */
 #undef DUK_F_C99
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
@@ -334,11 +334,6 @@
 #define DUK_F_VBCC
 #endif
 
-/* uclibc */
-#if defined(__UCLIBC__)
-#define DUK_F_UCLIBC
-#endif
-
 /*
  *  Platform autodetection
  */
@@ -688,6 +683,10 @@
 #include <stdint.h>
 #endif
 
+#if defined(DUK_F_CPP)
+#include <exception>  /* std::exception */
+#endif
+
 /*
  *  Architecture autodetection
  */
@@ -1264,6 +1263,11 @@
 #define DUK_F_VARIADIC_MACROS_PROVIDED
 #endif  /* autodetect compiler */
 
+/* uclibc */
+#if defined(__UCLIBC__)
+#define DUK_F_UCLIBC
+#endif
+
 /*
  *  Wrapper typedefs and constants for integer types, also sanity check types.
  *
@@ -2671,6 +2675,14 @@ typedef FILE duk_file;
 #define DUK_USE_COMMONJS_MODULES
 #endif
 
+#if defined(DUK_OPT_CPP_EXCEPTIONS)
+#define DUK_USE_CPP_EXCEPTIONS
+#elif defined(DUK_OPT_NO_CPP_EXCEPTIONS)
+#undef DUK_USE_CPP_EXCEPTIONS
+#else
+#undef DUK_USE_CPP_EXCEPTIONS
+#endif
+
 #if defined(DUK_OPT_DATAPTR16)
 #define DUK_USE_DATAPTR16
 #elif defined(DUK_OPT_NO_DATAPTR16)
@@ -2760,7 +2772,7 @@ typedef FILE duk_file;
 #elif defined(DUK_OPT_NO_DEBUGGER_THROW_NOTIFY)
 #undef DUK_USE_DEBUGGER_THROW_NOTIFY
 #else
-#undef DUK_USE_DEBUGGER_THROW_NOTIFY
+#define DUK_USE_DEBUGGER_THROW_NOTIFY
 #endif
 
 #if defined(DUK_OPT_DEBUGGER_TRANSPORT_TORTURE)
@@ -3484,27 +3496,9 @@ typedef FILE duk_file;
 #if defined(DUK_USE_DATAPTR_ENC16) && !defined(DUK_USE_DATAPTR16)
 #error config option DUK_USE_DATAPTR_ENC16 requires option DUK_USE_DATAPTR16 (which is missing)
 #endif
-#if defined(DUK_USE_DEBUGGER_DUMPHEAP) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_DUMPHEAP requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_FWD_LOGGING) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_FWD_LOGGING requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_FWD_PRINTALERT) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_FWD_PRINTALERT requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_PAUSE_UNCAUGHT) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_PAUSE_UNCAUGHT requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
 #if defined(DUK_USE_DEBUGGER_SUPPORT) && !defined(DUK_USE_INTERRUPT_COUNTER)
 #error config option DUK_USE_DEBUGGER_SUPPORT requires option DUK_USE_INTERRUPT_COUNTER (which is missing)
 #endif
-#if defined(DUK_USE_DEBUGGER_THROW_NOTIFY) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_THROW_NOTIFY requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
-#if defined(DUK_USE_DEBUGGER_TRANSPORT_TORTURE) && !defined(DUK_USE_DEBUGGER_SUPPORT)
-#error config option DUK_USE_DEBUGGER_TRANSPORT_TORTURE requires option DUK_USE_DEBUGGER_SUPPORT (which is missing)
-#endif
 #if defined(DUK_USE_DEEP_C_STACK)
 #error unsupported config option used (option has been removed): DUK_USE_DEEP_C_STACK
 #endif
@@ -3620,6 +3614,10 @@ typedef FILE duk_file;
 #error unsupported config option used (option has been removed): DUK_USE_UNALIGNED_ACCESSES_POSSIBLE
 #endif
 
+#if defined(DUK_USE_CPP_EXCEPTIONS) && !defined(__cplusplus)
+#error DUK_USE_CPP_EXCEPTIONS enabled but not compiling with a C++ compiler
+#endif
+
 /*
  *  Convert DUK_USE_BYTEORDER, from whatever source, into currently used
  *  internal defines.  If detection failed, #error out.
-- 
cgit v1.2.3