Skip to content

ensure that unistd.h is included on recent clang#2949

Merged
orbeckst merged 1 commit intodevelopfrom
issue-2934-unistd-apple
Sep 23, 2020
Merged

ensure that unistd.h is included on recent clang#2949
orbeckst merged 1 commit intodevelopfrom
issue-2934-unistd-apple

Conversation

@orbeckst
Copy link
Member

@orbeckst orbeckst commented Sep 19, 2020

Fixes #2934

Changes made in this Pull Request:

  • look for unistd.h when unix or APPLE is defined

PR Checklist

  • Tests?
  • Docs?
  • CHANGELOG updated?
  • Issue raised/referenced?

- fix #2934
- use unistd.h in ENCORE's spe.c when not WIN32 (e.g.  __unix__ or __APPLE__ but to be consistent
  with other uses in the code base we do not specifically test for __unix__ ||
  __APPLE__)
- update CHANGELOG
@orbeckst orbeckst force-pushed the issue-2934-unistd-apple branch from a1a7c9e to 56c5ea9 Compare September 19, 2020 01:18
@orbeckst orbeckst added this to the 2.0 milestone Sep 19, 2020
@codecov
Copy link

codecov bot commented Sep 19, 2020

Codecov Report

Merging #2949 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #2949   +/-   ##
========================================
  Coverage    93.02%   93.02%           
========================================
  Files          187      187           
  Lines        24962    24962           
  Branches      3261     3261           
========================================
  Hits         23220    23220           
  Misses        1694     1694           
  Partials        48       48           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c4478d3...56c5ea9. Read the comment docs.

Copy link
Member

@lilyminium lilyminium left a comment

Choose a reason for hiding this comment

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

Compiles for me, thanks @orbeckst!

Just because I looked it up to check that _WIN32 is defined on 64-bit:

_WIN32 Defined as 1 when the compilation target is 32-bit ARM, 64-bit ARM, x86, or x64. Otherwise, undefined.

@orbeckst orbeckst merged commit a321fa7 into develop Sep 23, 2020
@orbeckst orbeckst deleted the issue-2934-unistd-apple branch September 23, 2020 00:42
@orbeckst
Copy link
Member Author

Added to master (1.0.x) in ecbbc4e

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Compiling the C part fails due to not importing unistd

3 participants