Fix maximum structure alignment on Android i386

Fixes java-native-access#1079
BugsBeGone · Mar 30, 2019 · 43fd6a4 · 43fd6a4
1 parent 163a586
commit 43fd6a4
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java
@@ -223,11 +223,16 @@ static boolean isCompatibleVersion(String expectedVersion, String nativeVersion)
         if (Boolean.getBoolean("jna.protected")) {
             setProtected(true);
         }
-        MAX_ALIGNMENT = Platform.isSPARC() || Platform.isWindows()
-            || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS()))
-            || Platform.isAIX()
-            || Platform.isAndroid()
-            ? 8 : LONG_SIZE;
+        // Check for GNUC i386.  If not Windows, it must be GNUC.
+        if (!Platform.isWindows() && Platform.isIntel() && !Platform.is64Bit()) {
+            MAX_ALIGNMENT = 4;
+        } else {
+            MAX_ALIGNMENT = Platform.isSPARC() || Platform.isWindows()
+                || (Platform.isLinux() && (Platform.isARM() || Platform.isPPC() || Platform.isMIPS()))
+                || Platform.isAIX()
+                || Platform.isAndroid()
+                ? 8 : LONG_SIZE;
+        }
         MAX_PADDING = (Platform.isMac() && Platform.isPPC()) ? 8 : MAX_ALIGNMENT;
         System.setProperty("jna.loaded", "true");
     }