added aliases, renamed Flush to FlushMode

libs

@@ -1 +1 @@
-Subproject commit 34232d03b0ec836170379a3f82afde51485f549f
+Subproject commit ff2e0f209eb9fcec663437e66b5f76b8e730130b

std/cpp/_std/zip/Compress.hx

@@ -20,28 +20,28 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package haxe.zip;
- 
+
 @:coreApi
 class Compress {
- 
+
 	var s : Dynamic;
- 
+
 	public function new( level : Int ) {
 		s = _deflate_init(level);
 	}
- 
+
 	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
 		return _deflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
 	}
- 
-	public function setFlushMode( f : Flush ) {
+
+	public function setFlushMode( f : FlushMode ) {
 		_set_flush_mode(s,Std.string(f));
 	}
- 
+
 	public function close() {
 		_deflate_end(s);
 	}
- 
+
 	public static function run( s : haxe.io.Bytes, level : Int ) : haxe.io.Bytes {
 		var c = new Compress(level);
 		c.setFlushMode(Flush.FINISH);
@@ -52,11 +52,11 @@ class Compress {
 			throw "Compression failed";
 		return out.sub(0,r.write);
 	}
- 
+
 	static var _deflate_init = cpp.Lib.load("zlib","deflate_init",1);
 	static var _deflate_bound = cpp.Lib.load("zlib","deflate_bound",2);
 	static var _deflate_buffer = cpp.Lib.load("zlib","deflate_buffer",5);
 	static var _deflate_end = cpp.Lib.load("zlib","deflate_end",1);
 	static var _set_flush_mode = cpp.Lib.load("zlib","set_flush_mode",2);
- 
+
 }

std/cpp/_std/zip/Uncompress.hx

@@ -33,7 +33,7 @@ class Uncompress {
 		return _inflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
 	}
 
-	public function setFlushMode( f : Flush ) {
+	public function setFlushMode( f : FlushMode ) {
 		_set_flush_mode(s,untyped f.__Tag());
 	}
 

std/cpp/zip/Compress.hx

@@ -0,0 +1,5 @@
+package cpp.zip;
+
+#if (haxe_ver < 3.2)
+typedef Compress = haxe.zip.Compress;
+#end

std/cpp/zip/Flush.hx

@@ -1,24 +1,5 @@
-/*
- * Copyright (C)2005-2012 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
 package cpp.zip;
 
-typedef Flush = haxe.zip.Flush;
+#if (haxe_ver < 3.2)
+typedef Flush = haxe.zip.FlushMode;
+#end

std/cpp/zip/Uncompress.hx

@@ -0,0 +1,5 @@
+package cpp.zip;
+
+#if (haxe_ver < 3.2)
+typedef Uncompress = haxe.zip.Uncompress;
+#end

std/haxe/zip/Compress.hx

@@ -31,7 +31,7 @@ class Compress {
 		return null;
 	}
 
-	public function setFlushMode( f : Flush ) {
+	public function setFlushMode( f : FlushMode ) {
 	}
 
 	public function close() {

std/haxe/zip/Flush.hx → std/haxe/zip/FlushMode.hx

@@ -21,7 +21,7 @@
  */
 package haxe.zip;
 
-enum Flush {
+enum FlushMode {
 	NO;
 	SYNC;
 	FULL;

std/haxe/zip/Uncompress.hx

@@ -31,7 +31,7 @@ class Uncompress {
 		return null;
 	}
 
-	public function setFlushMode( f : Flush ) {
+	public function setFlushMode( f : FlushMode ) {
 	}
 
 	public function close() {

std/neko/_std/zip/Compress.hx

@@ -34,7 +34,7 @@ class Compress {
 		return _deflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
 	}
 
-	public function setFlushMode( f : Flush ) {
+	public function setFlushMode( f : FlushMode ) {
 		_set_flush_mode(s,untyped Std.string(f).__s);
 	}
 

std/neko/_std/zip/Uncompress.hx

@@ -34,7 +34,7 @@ class Uncompress {
 		return _inflate_buffer(s,src.getData(),srcPos,dst.getData(),dstPos);
 	}
 
-	public function setFlushMode( f : Flush ) {
+	public function setFlushMode( f : FlushMode ) {
 		_set_flush_mode(s,untyped Std.string(f).__s);
 	}
 

std/neko/zip/Compress.hx

@@ -0,0 +1,5 @@
+package neko.zip;
+
+#if (haxe_ver < 3.2)
+typedef Compress = haxe.zip.Compress;
+#end

std/neko/zip/Flush.hx

@@ -1,24 +1,5 @@
-/*
- * Copyright (C)2005-2012 Haxe Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
 package neko.zip;
 
-typedef Flush = haxe.zip.Flush;
+#if (haxe_ver < 3.2)
+typedef Flush = haxe.zip.FlushMode;
+#end

std/neko/zip/Uncompress.hx

@@ -0,0 +1,5 @@
+package neko.zip;
+
+#if (haxe_ver < 3.2)
+typedef Uncompress = haxe.zip.Uncompress;
+#end