diff --git a/05vishap.conf b/05vishap.conf index 88a0e25c..6d52bd32 100644 --- a/05vishap.conf +++ b/05vishap.conf @@ -1 +1 @@ -/opt/voc-1.1/lib +/Users/antranigv/local/voc-1.1/lib diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64 index 10309ead..ca070228 100644 --- a/makefile.darwin.clang.x86_64 +++ b/makefile.darwin.clang.x86_64 @@ -20,8 +20,9 @@ LIBNAME = VishapOberon LIBRARY = lib$(LIBNAME) ifndef PRF -PRF = "/opt" +#PRF = "/opt" #PRF = "/Users/noch/local" +PRF = "/Users/antranigv/local" endif PREFIX = $(PRF)/voc-$(RELEASE) PREFIXLN = $(PRF)/voc diff --git a/src/lib/system/darwin/clang/Kernel.Mod b/src/lib/system/darwin/clang/Kernel.Mod index 4fa025ab..f49d9b0c 100644 --- a/src/lib/system/darwin/clang/Kernel.Mod +++ b/src/lib/system/darwin/clang/Kernel.Mod @@ -118,7 +118,7 @@ MODULE Kernel; rs := readSet; FOR n := 0 TO 7 DO ws[n] := {}; xs[n] := {}; readySet[n] := {} END; IF delay < 0 THEN delay := 0 END ; - tv.sec := delay DIV 1000; tv.usec := delay MOD 1000 * 1000; + tv.sec := delay DIV 1000; tv.usec := SHORT(delay MOD 1000 * 1000); n := Unix.Select(256, rs, ws, xs, tv); IF n >= 0 THEN readySet := rs END END Select; diff --git a/src/lib/system/darwin/clang/Kernel0.Mod b/src/lib/system/darwin/clang/Kernel0.Mod index 6a58650f..70fe38f1 100644 --- a/src/lib/system/darwin/clang/Kernel0.Mod +++ b/src/lib/system/darwin/clang/Kernel0.Mod @@ -122,7 +122,7 @@ MODULE Kernel0; rs := readSet; FOR n := 0 TO 7 DO ws[n] := {}; xs[n] := {}; readySet[n] := {} END; IF delay < 0 THEN delay := 0 END ; - tv.sec := delay DIV 1000; tv.usec := delay MOD 1000 * 1000; + tv.sec := delay DIV 1000; tv.usec := SHORT(delay MOD 1000 * 1000); n := Unix.Select(256, rs, ws, xs, tv); IF n >= 0 THEN readySet := rs END END Select; diff --git a/src/lib/system/darwin/clang/x86_64/Unix.Mod b/src/lib/system/darwin/clang/x86_64/Unix.Mod index a7e4335b..012042a0 100644 --- a/src/lib/system/darwin/clang/x86_64/Unix.Mod +++ b/src/lib/system/darwin/clang/x86_64/Unix.Mod @@ -196,7 +196,8 @@ struct timeval *) Timeval* = RECORD - sec*, usec*: LONGINT + sec*: LONGINT; + usec*: INTEGER END ; diff --git a/src/voc/prf.Mod b/src/voc/prf.Mod index 2f4d8f24..c6ebba38 100644 --- a/src/voc/prf.Mod +++ b/src/voc/prf.Mod @@ -1,5 +1,5 @@ MODULE prf; -CONST prefix* = "/opt"; +CONST prefix* = "/Users/antranigv/local"; END prf. diff --git a/vocstatic.darwin.clang.x86_64.REMOVED.git-id b/vocstatic.darwin.clang.x86_64.REMOVED.git-id index ff1813f0..b76b930a 100644 --- a/vocstatic.darwin.clang.x86_64.REMOVED.git-id +++ b/vocstatic.darwin.clang.x86_64.REMOVED.git-id @@ -1 +1 @@ -8e48e37af1816a7bada0630583b22d2550196738 \ No newline at end of file +7aa2656d3ae7174c5bac1990daf5baac79ad3ad7 \ No newline at end of file