From 710804c88f1d582697c533d520f6c6449dc9ea52 Mon Sep 17 00:00:00 2001 From: Andrey Starodubtsev Date: Sun, 22 Jan 2017 13:08:47 +0300 Subject: [PATCH] WIP: #704 (java directorargout + java/typemaps.i fixes) - reverted changes in javahead.swg --- Lib/java/javahead.swg | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg index 43f21f863..685bba198 100644 --- a/Lib/java/javahead.swg +++ b/Lib/java/javahead.swg @@ -4,11 +4,11 @@ * Java support code * ----------------------------------------------------------------------------- */ -%insert(runtime) %{ + /* JNI function calls require different calling conventions for C and C++. These JCALL macros are used so * that the same typemaps can be used for generating code for both C and C++. The SWIG preprocessor can expand * the macros thereby generating the correct calling convention. It is thus essential that all typemaps that - * use the macros are not within SWIG brackets as they won't be run through the SWIG preprocessor. */ + * use the macros are not within %{ %} brackets as they won't be run through the SWIG preprocessor. */ #ifdef __cplusplus # define JCALL0(func, jenv) jenv->func() # define JCALL1(func, jenv, ar1) jenv->func(ar1) @@ -28,7 +28,6 @@ # define JCALL6(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6) (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6) # define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) #endif -%} %insert(runtime) %{ /* Fix for jlong on some versions of gcc on Windows */