diff options
author | Olly Betts <olly@survex.com> | 2022-07-20 15:05:21 +1200 |
---|---|---|
committer | Olly Betts <olly@survex.com> | 2022-10-05 12:40:15 +1300 |
commit | 4ac3c87a299368e22151bac3cae11e62cf23c730 (patch) | |
tree | 76d861abb572d942429d3d71999db138b4ecca0e /Lib/java | |
parent | abc1c59c4e67f912c409a2bb6b8f70f0e2809c9e (diff) | |
download | swig-4ac3c87a299368e22151bac3cae11e62cf23c730.tar.gz |
Sort out predefined SWIG-specific macros
Ensure that SWIG_VERSION is defined both at SWIG-time and in the
generated C/C++ wrapper code (it was only defined in the wrapper
for some target languages previously).
SWIGGO and SWIGJAVASCRIPT are now defined in the generated wrappers
to match behaviour for all other target languages.
Stop defining SWIGVERSION in the wrapper. This only happened as a
side-effect of how SWIG_VERSION was defined but was never documented and
is redundant.
The new testcase also checks that SWIG is defined at SWIG-time but not
in the generated wrapper, and that exactly one of a list of
target-language specific macros is defined.
Fixes #1050
Diffstat (limited to 'Lib/java')
-rw-r--r-- | Lib/java/java.swg | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/java/java.swg b/Lib/java/java.swg index 8719818bb..28eb8fd0d 100644 --- a/Lib/java/java.swg +++ b/Lib/java/java.swg @@ -4,6 +4,8 @@ * Java typemaps * ----------------------------------------------------------------------------- */ +%include <typemaps/swigversion.swg> + %include <javahead.swg> /* The jni, jtype and jstype typemaps work together and so there should be one of each. |