Support int64 in NativeCall signatures.

rakudo · Apr 4, 2015 · 5692768 · 5692768
1 parent d597a07
commit 5692768
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lib/NativeCall.pm b/lib/NativeCall.pm
@@ -130,6 +130,7 @@ my %type_map =
     'int8'     => 'char',
     'int16'    => 'short',
     'int32'    => 'int',
+    'int64'    => 'longlong',
     'long'     => 'long',
     'int'      => 'long',
     'Int'      => 'longlong',

diff --git a/t/04-nativecall/02-simple-args.c b/t/04-nativecall/02-simple-args.c
@@ -3,8 +3,10 @@
 
 #ifdef WIN32
 #define DLLEXPORT __declspec(dllexport)
+typedef signed __int64 int64_t;
 #else
 #define DLLEXPORT extern
+#include <inttypes.h>
 #endif
 
 DLLEXPORT int TakeInt(int x)
@@ -65,3 +67,10 @@ DLLEXPORT int wrapped(int n) {
         return 8;
     return 0;
 }
+
+DLLEXPORT int TakeInt64(int64_t x)
+{
+    if (x == 0xFFFFFFFFFF)
+        return 9;
+    return 0;
+}
diff --git a/t/04-nativecall/02-simple-args.t b/t/04-nativecall/02-simple-args.t
@@ -4,7 +4,7 @@ use lib 'lib';
 use NativeCall;
 use Test;
 
-plan 8;
+plan 9;
 
 compile_test_lib('02-simple-args');
 
@@ -37,7 +37,10 @@ is CheckString(), 7, 'checked previously passed string';
 # Make sure wrapped subs work
 sub wrapped(int32) returns int32 is native('./02-simple-args') { * }
 sub wrapper(int32 $arg) { is wrapped($arg), 8, 'wrapped sub' }
-
 wrapper(42);
 
+# 64-bit integer
+sub TakeInt64(int64) returns int32 is native('./02-simple-args') { * }
+is TakeInt64(0xFFFFFFFFFF), 9, 'passed int64 0xFFFFFFFFFF';
+
 # vim:ft=perl6