Intel compiler fix for __int64 typedef redefinition
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7370 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
cc4950fe05
commit
e00d664c62
1 changed files with 7 additions and 6 deletions
|
|
@ -30,15 +30,16 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
%insert(runtime) %{
|
%insert(runtime) %{
|
||||||
#if defined(__GNUC__)
|
/* Fix for jlong on some versions of gcc on Windows */
|
||||||
typedef long long __int64; /*For gcc on Windows */
|
#if defined(__GNUC__) && !defined(__INTELC__)
|
||||||
|
typedef long long __int64;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* fix for 'jlong' on x86_64 */
|
/* Fix for jlong on 64-bit x86 Solaris */
|
||||||
#if defined(__x86_64)
|
#if defined(__x86_64)
|
||||||
#ifdef _LP64 /* 64-bit Solaris */
|
# ifdef _LP64
|
||||||
#undef _LP64
|
# undef _LP64
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue