From bfd9e5f3e308182700571f73fdaa48d154c80ac3 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 11 Nov 2008 22:56:36 +0000
Subject: [PATCH] Add patch #2152691 from MATSUURA Takanori which fixes
 compiles using the Intel compiler

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10928 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current       | 4 ++++
 Lib/java/javahead.swg | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index 2c59d49ce..c9a620568 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -3,6 +3,10 @@
 Version 1.3.37 (in progress)
 ============================
 
+2008-11-01: wsfulton
+	    [Java] Add patch #2152691 from MATSUURA Takanori which fixes compiles using the
+	    Intel compiler
+
 2008-11-01: wsfulton
             Add patch #2128249 from Anatoly Techtonik which corrects the C/C++ proxy
             class being reported for Python docstrings when %rename is used.
diff --git a/Lib/java/javahead.swg b/Lib/java/javahead.swg
index 4aa0c84b5..fc4c4e267 100644
--- a/Lib/java/javahead.swg
+++ b/Lib/java/javahead.swg
@@ -34,7 +34,7 @@
 
 %insert(runtime) %{
 /* Fix for jlong on some versions of gcc on Windows */
-#if defined(__GNUC__) && !defined(__INTELC__)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
   typedef long long __int64;
 #endif