Merge branch 'Richie765-master'

Conflicts:
	CHANGES.current

Examples/test-suite/javascript/Makefile.in

@@ -19,8 +19,16 @@ else
 	JSENGINE=node
 endif
 
+ifneq (, $(V8_VERSION))
+    JSV8_VERSION=$(V8_VERSION)
+else
+    JSV8_VERSION=0x031110
+endif
+
 include $(srcdir)/../common.mk
 
+SWIGOPT += -DV8_VERSION=$(JSV8_VERSION)
+
 _setup = \
 	if [ -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then	  \
 	  echo "$(ACTION)ing $(LANGUAGE) ($(JSENGINE)) testcase $* (with run test)" ; \

Examples/test-suite/typemap_variables.i

@@ -16,7 +16,7 @@
 // For Javascript V8 we can not use '0' for out typemaps
 #if defined(SWIG_JAVASCRIPT_V8)
 %header %{
-#define OUT_NULL_VALUE v8::Null()
+#define OUT_NULL_VALUE SWIGV8_NULL()
 %}
 #else
 %header %{