update w32 natives

fix stdcall stack in libffi
auto-update version resource

.gitignore

@@ -16,4 +16,5 @@ dist/*-sources.jar
 dist/*-javadoc.jar
 dist/src-mvn.zip
 dist/out-of-date.jar
-perf*.txt
+perf*.txt
+native/libffi/doc/libffi.info

build.xml

@@ -582,6 +582,10 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
                    replace="ProductVersion","${spec.version}""
                    preserveLastModified="true"
                    file="${rsrc}" byline="true"/>
+    <replaceregexp match="(Copyright.*-)2..."
+                   replace="\1${year}"
+                   preserveLastModified="true"
+                   file="${rsrc}" byline="true"/>
   </target>
 
   <target name="native" depends="-setup,javah,-native-api-check,rsrc" unless="skip-native"

native/jnidispatch.rc

@@ -1,5 +1,5 @@
 // Resource file to generate version information for jnidispatch.dll
-// Copyright (c) 2008-2010 Timothy Wall
+// Copyright (c) 2008-2013 Timothy Wall
 // Type: version
 
 // Name: 1

native/libffi/src/x86/ffi.c

@@ -315,6 +315,9 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
   cif->bytes += 4 * sizeof(ffi_arg);
 #endif
 
+#ifdef X86_WIN32
+  if (cif->abi != FFI_STDCALL)
+#endif
   cif->bytes = (cif->bytes + 15) & ~0xF;
 
   return FFI_OK;