src/jdk.incubator.jextract/share/classes/jdk/incubator/jextract/tool/resources/RuntimeHelper.template

@@ -14,11 +14,11 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Optional;
 
-import static jdk.incubator.foreign.MemoryLayouts.*;
+import static ${C_LANG}.*;
 
 public class RuntimeHelper {
 
     private final static SystemABI ABI = SystemABI.getInstance();
 

@@ -193,11 +193,11 @@
 
         private MemoryLayout variadicLayout(Class<?> c) {
             if (c == char.class || c == byte.class || c == short.class || c == int.class || c == long.class) {
                 //it is ok to approximate with a machine word here; numerics arguments in a prototype-less
                 //function call are always rounded up to a register size anyway.
-                return C_LONG;
+                return C_LONGLONG;
             } else if (c == float.class || c == double.class) {
                 return C_DOUBLE;
             } else if (MemoryAddress.class.isAssignableFrom(c)) {
                 return C_POINTER;
             } else {