Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2989f13a71cb
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d8555039c56
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 1, 2019

  1. Copy the full SHA
    5ece1ff View commit details

Commits on Jan 2, 2019

  1. Merge pull request #960 from hannesm/mirage-clock-2

    mirage-clock 2.x only API change is type t = unit, which is fine with mirage
    avsm authored Jan 2, 2019
    Copy the full SHA
    7d85550 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 lib/mirage_impl_mclock.ml
  2. +2 −2 lib/mirage_impl_pclock.ml
4 changes: 2 additions & 2 deletions lib/mirage_impl_mclock.ml
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ let monotonic_clock_conf = object
method module_name = "Mclock"
method! packages =
Mirage_key.(if_ is_unix)
[ package ~min:"1.2.0" ~max:"2.0.0" "mirage-clock-unix" ]
[ package ~min:"1.2.0" ~max:"2.0.0" "mirage-clock-freestanding" ]
[ package ~min:"1.2.0" ~max:"3.0.0" "mirage-clock-unix" ]
[ package ~min:"1.2.0" ~max:"3.0.0" "mirage-clock-freestanding" ]
method! connect _ modname _args = Fmt.strf "%s.connect ()" modname
end

4 changes: 2 additions & 2 deletions lib/mirage_impl_pclock.ml
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ let posix_clock_conf = object
method module_name = "Pclock"
method! packages =
Mirage_key.(if_ is_unix)
[ package ~min:"1.2.0" ~max:"2.0.0" "mirage-clock-unix" ]
[ package ~min:"1.2.0" ~max:"2.0.0" "mirage-clock-freestanding" ]
[ package ~min:"1.2.0" ~max:"3.0.0" "mirage-clock-unix" ]
[ package ~min:"1.2.0" ~max:"3.0.0" "mirage-clock-freestanding" ]
method! connect _ modname _args = Fmt.strf "%s.connect ()" modname
end