mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-18 12:07:07 +02:00
82 lines
3.1 KiB
Diff
82 lines
3.1 KiB
Diff
Origin: https://github.com/HaxeFoundation/haxe/commit/526e57c40e1d1c928db1ffeaa0d0ec82daae2e86
|
|
From 526e57c40e1d1c928db1ffeaa0d0ec82daae2e86 Mon Sep 17 00:00:00 2001
|
|
From: tobil4sk <tobil4sk@outlook.com>
|
|
Date: Tue, 10 Sep 2024 15:03:51 +0100
|
|
Subject: [PATCH] Update to luv 0.5.13 (#11761)
|
|
|
|
---
|
|
src/macro/eval/evalLuv.ml | 8 ++++----
|
|
std/eval/luv/FsEvent.hx | 2 +-
|
|
std/eval/luv/Resource.hx | 6 ++++--
|
|
3 files changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/macro/eval/evalLuv.ml b/src/macro/eval/evalLuv.ml
|
|
index 12099b5f6b9edf50c576111f4649fb70432fbbae..07aee9a39991c47d363bcdf88d03fa2c40ea79c0 100644
|
|
--- a/src/macro/eval/evalLuv.ml
|
|
+++ b/src/macro/eval/evalLuv.ml
|
|
@@ -1942,7 +1942,7 @@ let fs_event_fields = [
|
|
) events
|
|
in
|
|
encode_obj [
|
|
- key_file,vnative_string file;
|
|
+ key_file,encode_nullable vnative_string file;
|
|
key_events,encode_array vevents;
|
|
]
|
|
) v4
|
|
@@ -2175,7 +2175,7 @@ let env_fields = [
|
|
let time_fields = [
|
|
"getTimeOfDay", vfun0 (fun() ->
|
|
encode_result (fun (t:Time.t) ->
|
|
- encode_obj [key_sec,VInt64 t.tv_sec; key_usec,vint32 t.tv_usec]
|
|
+ encode_obj [key_sec,VInt64 t.sec; key_usec,vint32 t.usec]
|
|
) (Time.gettimeofday())
|
|
);
|
|
"hrTime", vfun0 (fun() ->
|
|
@@ -2292,10 +2292,10 @@ let resource_fields = [
|
|
encode_array_a [|vfloat m1; vfloat m5; vfloat m15|];
|
|
);
|
|
"freeMemory", vfun0 (fun() ->
|
|
- VUInt64 (Resource.free_memory())
|
|
+ encode_nullable (fun u -> VUInt64 u) (Resource.free_memory())
|
|
);
|
|
"totalMemory", vfun0 (fun() ->
|
|
- VUInt64 (Resource.total_memory())
|
|
+ encode_nullable (fun u -> VUInt64 u) (Resource.total_memory())
|
|
);
|
|
"constrainedMemory", vfun0 (fun() ->
|
|
encode_nullable (fun u -> VUInt64 u) (Resource.constrained_memory())
|
|
diff --git a/std/eval/luv/FsEvent.hx b/std/eval/luv/FsEvent.hx
|
|
index 5571138197f58e4068e74e4e4190318c2647b807..5df6c3bf151cdda8e89a0620ad5e1e81b71a69bf 100644
|
|
--- a/std/eval/luv/FsEvent.hx
|
|
+++ b/std/eval/luv/FsEvent.hx
|
|
@@ -26,7 +26,7 @@ enum abstract FsEventFlag(Int) {
|
|
/**
|
|
Starts the handle and watches the given path for changes.
|
|
**/
|
|
- public function start(path:NativeString, ?flags:Array<FsEventFlag>, callback:(result:Result<{file:NativeString,events:Array<FsEventType>}>)->Void):Void;
|
|
+ public function start(path:NativeString, ?flags:Array<FsEventFlag>, callback:(result:Result<{file:Null<NativeString>,events:Array<FsEventType>}>)->Void):Void;
|
|
|
|
/**
|
|
Stops the handle.
|
|
diff --git a/std/eval/luv/Resource.hx b/std/eval/luv/Resource.hx
|
|
index 5457e74f6eafbb29d45e458925d0383fd4d7b3bc..de70d5d1b78f45387033e1831a394330907c4bfc 100644
|
|
--- a/std/eval/luv/Resource.hx
|
|
+++ b/std/eval/luv/Resource.hx
|
|
@@ -40,13 +40,15 @@ extern class Resource {
|
|
|
|
/**
|
|
Evaluates to the amount of free memory, in bytes.
|
|
+ Returns `null` when unknown.
|
|
**/
|
|
- static function freeMemory():UInt64;
|
|
+ static function freeMemory():Null<UInt64>;
|
|
|
|
/**
|
|
Evaluates to the total amount of memory, in bytes.
|
|
+ Returns `null` when unknown.
|
|
**/
|
|
- static function totalMemory():UInt64;
|
|
+ static function totalMemory():Null<UInt64>;
|
|
|
|
/**
|
|
Gets the amount of memory available to the process (in bytes) based on
|