summaryrefslogtreecommitdiffstats
path: root/bundles
diff options
context:
space:
mode:
authorSilenio Quarti <silenio>2008-09-08 19:13:23 +0000
committerSilenio Quarti <silenio>2008-09-08 19:13:23 +0000
commitf38d49f49552ce44e60b5c48755169f5fead15c2 (patch)
treeb01d7a8098519e72eb634fee94138a3a62445031 /bundles
parent8a559183a6de818e2b5401efcd8ad8e97ad8e68d (diff)
downloadeclipse.platform.swt-f38d49f49552ce44e60b5c48755169f5fead15c2.tar.gz
eclipse.platform.swt-f38d49f49552ce44e60b5c48755169f5fead15c2.tar.xz
eclipse.platform.swt-f38d49f49552ce44e60b5c48755169f5fead15c2.zip
*** empty log message ***
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java2
-rw-r--r--bundles/org.eclipse.swt.tools/plugin.xml2
-rw-r--r--bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/JNIBuilder.java (renamed from bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/jni/builder/JNIBuilder.java)2
3 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
index 2211b37efa..4b3eab01f5 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
@@ -580,7 +580,7 @@ void generateFunctionCall(JNIMethod method, JNIParameter[] params, JNIType retur
}
output("arg0)");
paramStart = 1;
- } else if (name.startsWith("VtblCall")) {
+ } else if (name.startsWith("VtblCall") || name.startsWith("_VtblCall")) {
output("((");
output(returnType.getTypeSignature2(!returnType.equals(returnType64)));
output(" (STDMETHODCALLTYPE *)(");
diff --git a/bundles/org.eclipse.swt.tools/plugin.xml b/bundles/org.eclipse.swt.tools/plugin.xml
index 3578893d5c..253d4b8537 100644
--- a/bundles/org.eclipse.swt.tools/plugin.xml
+++ b/bundles/org.eclipse.swt.tools/plugin.xml
@@ -29,7 +29,7 @@
name="%jniBuilderName"
point="org.eclipse.core.resources.builders">
<builder hasNature="false">
- <run class="org.eclipse.swt.tools.jni.builder.JNIBuilder"/>
+ <run class="org.eclipse.swt.tools.builders.JNIBuilder"/>
</builder>
</extension>
diff --git a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/jni/builder/JNIBuilder.java b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/JNIBuilder.java
index a8c163fc13..60a1efdeb9 100644
--- a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/jni/builder/JNIBuilder.java
+++ b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/JNIBuilder.java
@@ -1,4 +1,4 @@
-package org.eclipse.swt.tools.jni.builder;
+package org.eclipse.swt.tools.builders;
import java.util.Map;