kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Haxe 3.1.3 fix

Browse Source
This commit is contained in:
Joshua Granick
2015-08-31 23:34:08 -07:00
parent e793334bbb
commit 5f21675f87
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lime/system/CFFI.hx
View File

@@ -551,7 +551,11 @@ class CFFI {
private static function __getFunctionType (args:Array<{ name : String, opt : Bool, t : Type }>, result:Type) { private static function __getFunctionType (args:Array<{ name : String, opt : Bool, t : Type }>, result:Type) {
var isCPP = (Context.defined ("cpp") && !Context.defined ("disable_cffi") && !Context.defined ("display")); #if ((haxe_ver >= 3.2) && !disable_cffi && !display)
var useCPPTypes = Context.defined ("cpp");
#else
var useCPPTypes = false;
#end
var typeArgs = []; var typeArgs = [];
var typeResult = null; var typeResult = null;
@@ -573,7 +577,7 @@ class CFFI {
case "cpp.Float32": case "cpp.Float32":
if (isCPP) { if (useCPPTypes) {
typeArgs.push ( { name: arg.name, opt: false, t: (macro :cpp.Float32).toType () } ); typeArgs.push ( { name: arg.name, opt: false, t: (macro :cpp.Float32).toType () } );
@@ -602,7 +606,7 @@ class CFFI {
case "Void", "cpp.Void": case "Void", "cpp.Void":
if (isCPP) { if (useCPPTypes) {
typeArgs.push ( { name: arg.name, opt: false, t: (macro :cpp.Void).toType () } ); typeArgs.push ( { name: arg.name, opt: false, t: (macro :cpp.Void).toType () } );
@@ -616,7 +620,7 @@ class CFFI {
default: default:
if (isCPP) { if (useCPPTypes) {
typeArgs.push ( { name: arg.name, opt: false, t: (macro :cpp.Object).toType () } ); typeArgs.push ( { name: arg.name, opt: false, t: (macro :cpp.Object).toType () } );
@@ -646,7 +650,7 @@ class CFFI {
case "cpp.Float32": case "cpp.Float32":
if (isCPP) { if (useCPPTypes) {
typeResult = (macro :cpp.Float32).toType (); typeResult = (macro :cpp.Float32).toType ();
@@ -675,7 +679,7 @@ class CFFI {
case "Void", "cpp.Void": case "Void", "cpp.Void":
if (isCPP) { if (useCPPTypes) {
typeResult = (macro :cpp.Void).toType (); typeResult = (macro :cpp.Void).toType ();
@@ -689,7 +693,7 @@ class CFFI {
default: default:
if (isCPP) { if (useCPPTypes) {
typeResult = (macro :cpp.Object).toType (); typeResult = (macro :cpp.Object).toType ();