diff options
| author | Kenneth Russel <[email protected]> | 2005-04-24 22:59:51 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2005-04-24 22:59:51 +0000 |
| commit | 492f117fd3f76c7a5778ca2a07c6f5803242b8e0 (patch) | |
| tree | bebfe51a2cb8fc36613cdd8ad6caf04b88d1ef47 /src/net/java/games/gluegen/CMethodBindingEmitter.java | |
| parent | c35019b5256ca33fb642d54608101ab7292f3c60 (diff) | |
Merged with current JOGL trunk (by using -r HEAD)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@262 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/net/java/games/gluegen/CMethodBindingEmitter.java')
| -rw-r--r-- | src/net/java/games/gluegen/CMethodBindingEmitter.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/java/games/gluegen/CMethodBindingEmitter.java b/src/net/java/games/gluegen/CMethodBindingEmitter.java index b9cc0091e..8abcdcd78 100644 --- a/src/net/java/games/gluegen/CMethodBindingEmitter.java +++ b/src/net/java/games/gluegen/CMethodBindingEmitter.java @@ -609,7 +609,7 @@ public class CMethodBindingEmitter extends FunctionEmitter writer.print(" "); emitGetStringUTFChars(writer, "(jstring) _tmpObj", - "(const char*)"+convName+"_copy[_copyIndex]"); + convName+"_copy[_copyIndex]"); } else if (isNIOBufferClass(subArrayElementJavaType)) { @@ -781,7 +781,7 @@ public class CMethodBindingEmitter extends FunctionEmitter } // free the main array - writer.print(" free("); + writer.print(" free((void*) "); writer.print(convName+"_copy"); writer.println(");"); } // end of cleaning up copied data @@ -1251,7 +1251,7 @@ public class CMethodBindingEmitter extends FunctionEmitter Class elementType = javaType.getJavaClass().getComponentType(); if (javaType.isArray() && javaType.getJavaClass().getComponentType() == java.lang.String.class) { - writer.print(" char **"); + writer.print(" const char **"); } else { writer.print(ptrTypeString); } |