2 files changed, 6 insertions, 9 deletions
diff --git a/src/java/com/sun/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java b/src/java/com/sun/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java
index 54263a5..b7fac1b 100755
--- a/src/java/com/sun/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java
+++ b/src/java/com/sun/gluegen/procaddress/ProcAddressCMethodBindingEmitter.java
@@ -140,12 +140,10 @@ public class ProcAddressCMethodBindingEmitter extends CMethodBindingEmitter {
     super.emitBodyVariableDeclarations(writer);
   }
 
-  protected void emitBodyVariablePreCallSetup(PrintWriter writer,
-                                              boolean emittingPrimitiveArrayCritical) {
-    super.emitBodyVariablePreCallSetup(writer, emittingPrimitiveArrayCritical);
+  protected void emitBodyVariablePreCallSetup(PrintWriter writer) {
+    super.emitBodyVariablePreCallSetup(writer);
 
     if (callThroughProcAddress) {
-      if (!emittingPrimitiveArrayCritical) {
         // set the function pointer to the value of the passed-in procAddress
         FunctionSymbol cSym = getBinding().getCSymbol();
         String funcPointerTypedefName = emitter.getFunctionPointerTypedefName(cSym);
@@ -162,7 +160,6 @@ public class ProcAddressCMethodBindingEmitter extends CMethodBindingEmitter {
         writer.println(") (intptr_t) procAddress;");
 
         writer.println("  assert(" + ptrVarName + " != NULL);");
-      }
     }
   }
 
diff --git a/src/java/com/sun/gluegen/procaddress/ProcAddressJavaMethodBindingEmitter.java b/src/java/com/sun/gluegen/procaddress/ProcAddressJavaMethodBindingEmitter.java
index f6ae58e..2dda752 100755
--- a/src/java/com/sun/gluegen/procaddress/ProcAddressJavaMethodBindingEmitter.java
+++ b/src/java/com/sun/gluegen/procaddress/ProcAddressJavaMethodBindingEmitter.java
@@ -110,8 +110,8 @@ public class ProcAddressJavaMethodBindingEmitter extends JavaMethodBindingEmitte
     return numEmitted;
   }
 
-  protected String getImplMethodName(boolean direct) {
-    String name = super.getImplMethodName(direct);
+  protected String getImplMethodName() {
+    String name = super.getImplMethodName();
     if (callThroughProcAddress) {
       return ProcAddressEmitter.WRAP_PREFIX + name;
     }
@@ -131,8 +131,8 @@ public class ProcAddressJavaMethodBindingEmitter extends JavaMethodBindingEmitte
     }
   }
 
-  protected int emitCallArguments(MethodBinding binding, PrintWriter writer, boolean indirect) {
-    int numEmitted = super.emitCallArguments(binding, writer, indirect);
+  protected int emitCallArguments(MethodBinding binding, PrintWriter writer) {
+    int numEmitted = super.emitCallArguments(binding, writer);
     if (callThroughProcAddress) {
       if (numEmitted > 0) {
         writer.print(", ");