Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use caml/unixsupport.h instead of extern #74

Merged
merged 1 commit into from
Jun 15, 2022
Merged

Conversation

dra27
Copy link
Contributor

@dra27 dra27 commented Jun 13, 2022

This is equivalent to mirage/mirage-block-unix#115, as ocaml-vhd contains the same C code.

While performing impact testing for ocaml/ocaml#10926, I found this presumably older code which declared uerror as an extern. caml/unixsupport.h declares this function, which means that the code carries on working if we rename uerror (which we're planning on doing in 5.0!).

This PR could be merged regardless of the upstream OCaml PR.

Copy link
Member

@djs55 djs55 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks again!

@djs55
Copy link
Member

djs55 commented Jun 15, 2022

CI is broken because of Cstruct.len, will fix separately.

@djs55 djs55 merged commit 95f7d1b into mirage:master Jun 15, 2022
djs55 added a commit to djs55/opam-repository that referenced this pull request Jun 19, 2022
CHANGES:

* Lint opam file (@kit-ty-kate, mirage/ocaml-vhd#72)
* Use ounit2 (@Alessandro-Barbieri, mirage/ocaml-vhd#73)
* Use unixsupport.h for OCaml 5.0 compat (@dra27, mirage/ocaml-vhd#74)
* Set upper bounds on cstruct (@djs55, mirage/ocaml-vhd#75)
* Set lower bound on uuidm (@djs55, mirage/ocaml-vhd#75)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants