[js] guard against including js.html.compat stuff when -D nodejs (see H…

…axeFoundation/hxnodejs#42)
delahee · Nov 8, 2015 · aa3747d · aa3747d
1 parent a309bd2
commit aa3747d
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 5 deletions.
diff --git a/std/js/_std/haxe/io/ArrayBufferView.hx b/std/js/_std/haxe/io/ArrayBufferView.hx
@@ -27,7 +27,11 @@ abstract ArrayBufferView(ArrayBufferViewData) {
 
 	public static var EMULATED(get,never) : Bool;
 	static inline function get_EMULATED() {
+		#if nodejs
+		return false;
+		#else
 		return (cast js.html.ArrayBuffer) == js.html.compat.ArrayBuffer;
+		#end
 	}
 
 	public var buffer(get,never) : haxe.io.Bytes;

diff --git a/std/js/_std/haxe/io/Bytes.hx b/std/js/_std/haxe/io/Bytes.hx
@@ -20,8 +20,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package haxe.io;
+
+#if !nodejs
 import js.html.compat.Uint8Array;
 import js.html.compat.DataView;
+#end
 
 @:coreApi
 class Bytes {

diff --git a/std/js/_std/haxe/io/Float32Array.hx b/std/js/_std/haxe/io/Float32Array.hx
@@ -21,7 +21,9 @@
  */
 package haxe.io;
 
+#if !nodejs
 import js.html.compat.Float32Array;
+#end
 
 typedef Float32ArrayData = js.html.Float32Array;
 

diff --git a/std/js/_std/haxe/io/Float64Array.hx b/std/js/_std/haxe/io/Float64Array.hx
@@ -21,7 +21,9 @@
  */
 package haxe.io;
 
+#if !nodejs
 import js.html.compat.Float64Array;
+#end
 
 typedef Float64ArrayData = js.html.Float64Array;
 

diff --git a/std/js/html/compat/ArrayBuffer.hx b/std/js/html/compat/ArrayBuffer.hx
@@ -21,6 +21,7 @@
  */
 package js.html.compat;
 
+#if !nodejs
 @:keep
 class ArrayBuffer {
 
@@ -56,4 +57,5 @@ class ArrayBuffer {
 		var ArrayBuffer = js.Lib.global.ArrayBuffer || js.html.compat.ArrayBuffer;
 		if( ArrayBuffer.prototype.slice == null ) ArrayBuffer.prototype.slice = sliceImpl; // IE10
 	}
-}
+}
+#end
diff --git a/std/js/html/compat/DataView.hx b/std/js/html/compat/DataView.hx
@@ -20,6 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package js.html.compat;
+
+#if !nodejs
 import haxe.io.Error;
 
 @:ifFeature("haxe.io.Float32Array.*", "haxe.io.Float64Array.*")
@@ -141,4 +143,5 @@ class DataView {
 		var DataView = untyped js.Lib.global.DataView || js.html.compat.DataView;
 	}
 
-}
+}
+#end
diff --git a/std/js/html/compat/Float32Array.hx b/std/js/html/compat/Float32Array.hx
@@ -21,6 +21,7 @@
  */
 package js.html.compat;
 
+#if !nodejs
 @:keep
 class Float32Array {
 
@@ -106,4 +107,5 @@ class Float32Array {
 		var Float32Array = untyped js.Lib.global.Float32Array || _new;
 	}
 
-}
+}
+#end
diff --git a/std/js/html/compat/Float64Array.hx b/std/js/html/compat/Float64Array.hx
@@ -21,6 +21,7 @@
  */
 package js.html.compat;
 
+#if !nodejs
 @:keep
 class Float64Array {
 
@@ -113,4 +114,5 @@ class Float64Array {
 		var Float64Array = untyped js.Lib.global.Float64Array || (js.Lib.global.Float32Array ? 'notsupported' : null) || _new;
 	}
 
-}
+}
+#end
diff --git a/std/js/html/compat/Uint8Array.hx b/std/js/html/compat/Uint8Array.hx
@@ -21,6 +21,7 @@
  */
 package js.html.compat;
 
+#if !nodejs
 @:keep
 class Uint8Array {
 
@@ -97,4 +98,5 @@ class Uint8Array {
 		var Uint8Array = untyped js.Lib.global.Uint8Array || _new;
 	}
 
-}
+}
+#end