updated "Promote float varargs to double" bug fix

java-native-access · Jan 26, 2016 · 7f54d4c · 7f54d4c
1 parent d1f179a
commit 7f54d4c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -40,6 +40,7 @@ Bug Fixes
 * [#536](https://github.com/java-native-access/jna/pull/536): Fixed bug in determining the Library and options associated with types defined outside of a Library - [@twall](https://github.com/twall).
 * [#531](https://github.com/java-native-access/jna/pull/531): Ensure direct-mapped callbacks use the right calling convention - [@twall](https://github.com/twall).
 * [#566](https://github.com/java-native-access/jna/pull/566): Fix return type of Native#loadLibrary to match unconstrained generic [@lgoldstein](https://github.com/lgoldstein)
+* [#584](https://github.com/java-native-access/jna/pull/584): Promote float varargs to double - [@marco2357](https://github.com/marco2357).
 
 Release 4.2.1
 =============

diff --git a/native/testlib.c b/native/testlib.c
@@ -872,7 +872,8 @@ addInt32VarArgs(const char *fmt, ...) {
     case 'c':
       sum += (int) va_arg(ap, int);
       break;
-    case 'f':
+    case 'f': // float (promoted to ‘double’ when passed through ‘...’)
+    case 'F': // double
       sum += va_arg(ap, double);
       break;
     default:

diff --git a/test/com/sun/jna/VarArgsTest.java b/test/com/sun/jna/VarArgsTest.java
@@ -70,7 +70,7 @@ public void testDoubleVarArgs() {
         double arg1 = 1;
         double arg2 = 2;
         assertEquals("VarArgs not added correctly", (int)arg1 + (int)arg2,
-                     lib.addInt32VarArgs("ff", Double.valueOf(arg1), Double.valueOf(arg2)));
+                     lib.addInt32VarArgs("FF", Double.valueOf(arg1), Double.valueOf(arg2)));
     }
     public void testStringVarArgs() {
         Object[] args = new Object[] { "Test" };