Author: mturk Date: Mon Jun 22 10:41:47 2009 New Revision: 787191 URL: http://svn.apache.org/viewvc?rev=787191&view=rev Log: Aling structures largen then alignment
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractStructure.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractStructure.java URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractStructure.java?rev=787191&r1=787190&r2=787191&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractStructure.java (original) +++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractStructure.java Mon Jun 22 10:41:47 2009 @@ -110,7 +110,8 @@ else sizeof += esizes[i]; } - sizeof = align(sizeof, align); + if ((sizeof > align) && (esizes[count - 1] > 1)) + sizeof = align(sizeof, align); } inited = true; } Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java?rev=787191&r1=787190&r2=787191&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java (original) +++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java Mon Jun 22 10:41:47 2009 @@ -72,7 +72,7 @@ if (PLENGTH > 0) return PLENGTH; else - return 4; + return 8; } private static native int peek0(long addr);