diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2021-03-19 21:40:23 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2021-03-19 21:40:23 +0000 |
| commit | 3163888c4bbaa7f165e02846ea2983a5f53b4caa (patch) | |
| tree | 20b3e7af320a4967dc3aded9756332a15a76dacf | |
| parent | 22e82c21119d47fb78e98321bcbf5f6ae16299cd (diff) | |
| parent | 1eebc2335a7d607e3bb7466ce125a9495304c029 (diff) | |
| download | swig-3163888c4bbaa7f165e02846ea2983a5f53b4caa.tar.gz | |
Merge branch 'java-jlong-cleanup'
* java-jlong-cleanup:
Lib/java/arrays_java.i: use actual C/C++ type in JAVA_ARRAYS_TYPEMAPS.
Lib/java/javahead.swg: clean up jlong handling.
| -rw-r--r-- | Lib/java/arrays_java.i | 4 | ||||
| -rw-r--r-- | Lib/java/javahead.swg | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/Lib/java/arrays_java.i b/Lib/java/arrays_java.i index dd38438a3..a57da64b4 100644 --- a/Lib/java/arrays_java.i +++ b/Lib/java/arrays_java.i @@ -104,7 +104,7 @@ JAVA_ARRAYS_DECL(int, jint, Int, Int) /* int[] */ JAVA_ARRAYS_DECL(unsigned int, jlong, Long, Uint) /* unsigned int[] */ JAVA_ARRAYS_DECL(long, jint, Int, Long) /* long[] */ JAVA_ARRAYS_DECL(unsigned long, jlong, Long, Ulong) /* unsigned long[] */ -JAVA_ARRAYS_DECL(jlong, jlong, Long, Longlong) /* long long[] */ +JAVA_ARRAYS_DECL(long long, jlong, Long, Longlong) /* long long[] */ JAVA_ARRAYS_DECL(float, jfloat, Float, Float) /* float[] */ JAVA_ARRAYS_DECL(double, jdouble, Double, Double) /* double[] */ @@ -128,7 +128,7 @@ JAVA_ARRAYS_IMPL(int, jint, Int, Int) /* int[] */ JAVA_ARRAYS_IMPL(unsigned int, jlong, Long, Uint) /* unsigned int[] */ JAVA_ARRAYS_IMPL(long, jint, Int, Long) /* long[] */ JAVA_ARRAYS_IMPL(unsigned long, jlong, Long, Ulong) /* unsigned long[] */ -JAVA_ARRAYS_IMPL(jlong, jlong, Long, Longlong) /* long long[] */ +JAVA_ARRAYS_IMPL(long long, jlong, Long, Longlong) /* long long[] */ JAVA_ARRAYS_IMPL(float, jfloat, Float, Float) /* float[] */ JAVA_ARRAYS_IMPL(double, jdouble, Double, Double) /* double[] */ diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg index 2e10254f3..1fc327909 100644 --- a/Lib/java/javahead.swg +++ b/Lib/java/javahead.swg @@ -30,18 +30,6 @@ #endif %insert(runtime) %{ -/* Fix for jlong on some versions of gcc on Windows */ -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) - typedef long long __int64; -#endif - -/* Fix for jlong on 64-bit x86 Solaris */ -#if defined(__x86_64) -# ifdef _LP64 -# undef _LP64 -# endif -#endif - #include <jni.h> #include <stdlib.h> #include <string.h> |