1 files changed, 16 insertions, 0 deletions
diff --git a/src/net/java/games/gluegen/opengl/CGLPAWrapperEmitter.java b/src/net/java/games/gluegen/opengl/CGLPAWrapperEmitter.java
index cd0554dc3..2a1559e52 100644
--- a/src/net/java/games/gluegen/opengl/CGLPAWrapperEmitter.java
+++ b/src/net/java/games/gluegen/opengl/CGLPAWrapperEmitter.java
@@ -68,6 +68,15 @@ public class CGLPAWrapperEmitter extends CMethodBindingEmitter
       methodToWrap.getIsJavaMethodStatic(),
       methodToWrap.getDefaultOutput()
       );
+
+    if (methodToWrap.getReturnValueCapacityExpression() != null) {
+      setReturnValueCapacityExpression(methodToWrap.getReturnValueCapacityExpression());
+    }
+    if (methodToWrap.getReturnValueLengthExpression() != null) {
+      setReturnValueLengthExpression(methodToWrap.getReturnValueLengthExpression());
+    }
+    setTemporaryCVariableDeclarations(methodToWrap.getTemporaryCVariableDeclarations());
+    setTemporaryCVariableAssignments (methodToWrap.getTemporaryCVariableAssignments ());
     
     setCommentEmitter(defaultCommentEmitter);
   }
@@ -192,6 +201,13 @@ public class CGLPAWrapperEmitter extends CMethodBindingEmitter
     writer.println(");");
   }
 
+  protected String jniMangle(MethodBinding binding) {
+    StringBuffer buf = new StringBuffer();
+    buf.append(super.jniMangle(binding));
+    jniMangle(Long.TYPE, buf);
+    return buf.toString();
+  }
+
   /** This class emits the comment for the wrapper method */
   private static class CGLPAWrapperCommentEmitter extends CMethodBindingEmitter.DefaultCommentEmitter {
     protected void emitBeginning(FunctionEmitter methodEmitter, PrintWriter writer) {