summaryrefslogtreecommitdiffstats
path: root/src/java/com/sun/gluegen/JavaEmitter.java
diff options
context:
space:
mode:
authorMark Rothwell <[email protected]>2010-06-26 15:36:02 +0000
committerMark Rothwell <[email protected]>2010-06-26 15:36:02 +0000
commitffde1f44409bc7d49ceb18554c660bf9091cac42 (patch)
tree97642dddd8c2d14b9caef962ee9a75114d2ef66a /src/java/com/sun/gluegen/JavaEmitter.java
parent198cccab882db0409ee8b18fcafb20f079d9e01e (diff)
parentae37ac16a13aa62cd6e7a6ff0346403c5aa6b3e5 (diff)
Merge branch 'master' of git://github.com/mbien/gluegen into freebsd-fixes
Diffstat (limited to 'src/java/com/sun/gluegen/JavaEmitter.java')
-rw-r--r--src/java/com/sun/gluegen/JavaEmitter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/sun/gluegen/JavaEmitter.java b/src/java/com/sun/gluegen/JavaEmitter.java
index 2a51a64..c7156c3 100644
--- a/src/java/com/sun/gluegen/JavaEmitter.java
+++ b/src/java/com/sun/gluegen/JavaEmitter.java
@@ -1279,8 +1279,8 @@ public class JavaEmitter implements GlueEmitter {
if (targetType.isVoid()) {
return JavaType.createForVoidPointer();
} else if (targetType.isInt()) {
- // size_t is always a PointerBuffer since size is arch dependent
- if ("size_t".equals(targetType.getName())) {
+ // size_t and intptr_t is always a PointerBuffer since size is arch dependent
+ if ("size_t".equals(targetType.getName()) || "intptr_t".equals(targetType.getName())) {
return JavaType.forNIOPointerBufferClass();
}
switch ((int) targetType.getSize(curMachDesc)) {