Ver código fonte

Merge pull request #673 from bmx-ng/task/zlib-ulongint

Updated for zlib changes to use ULongInt
Brucey 10 meses atrás
pai
commit
ebf573d5c3
1 arquivos alterados com 6 adições e 10 exclusões
  1. 6 10
      config.bmx

+ 6 - 10
config.bmx

@@ -623,15 +623,13 @@ Type TTemplateRecord
 ?Not bmxng
 		Local slen:Int = strlen_(s)
 ?bmxng
-		Local slen:UInt = strlen_(s)
+		Local slen:ULongInt = strlen_(s)
 ?
 
 ?Not bmxng		
 		Local dlen:Int = slen + 12
-?bmxng And (win32 Or ptr32)
-		Local dlen:UInt = slen + 12
-?bmxng And ptr64 And Not win32
-		Local dlen:ULong = slen + 12
+?bmxng
+		Local dlen:ULongInt = slen + 12
 ?
 		Local data:Byte[dlen]
 		
@@ -651,10 +649,8 @@ Type TTemplateRecord
 		
 ?Not bmxng		
 		Local dlen:Int = size + 1
-?bmxng And (win32 Or ptr32)
-		Local dlen:UInt = size + 1
-?bmxng And ptr64 And Not win32
-		Local dlen:ULong = size + 1
+?bmxng
+		Local dlen:ULongInt = size + 1
 ?
 		Local data:Byte[dlen]
 		
@@ -662,7 +658,7 @@ Type TTemplateRecord
 ?Not bmxng
 		uncompress(data, dlen, s, s.length)
 ?bmxng
-		uncompress(data, dlen, s, UInt(s.length))
+		uncompress(data, dlen, s, ULongInt(s.length))
 ?	
 		Return New TTemplateRecord.Create(start, file, String.FromUTF8String(data))
 	End Function