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.

Sign up for GitHub

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

Jump to bottom

Exclude superfluous headers for ModelicaInternal.c if NO_FILE_SYSTEM is defined #3222

Merged
merged 1 commit into from
Nov 12, 2019
Merged

Exclude superfluous headers for ModelicaInternal.c if NO_FILE_SYSTEM is defined #3222

merged 1 commit into from
Nov 12, 2019

Conversation

beutlich
Copy link
Member

No need to include headers string.h or unistd.h if NO_FILE_SYSTEM is defined. Resolves #3221.

@beutlich
refs modelica#3221: Exclude headers if NO_FILE_SYSTEM is defined
db304ae 
No need to include headers string.h or unistd.h if NO_FILE_SYSTEM is defined
@beutlich beutlich added enhancement New feature or enhancement L: C-Sources Issue addresses Modelica/Resources/C-Sources labels Nov 11, 2019
@beutlich beutlich added this to the MSL4.0.0 milestone Nov 11, 2019
@beutlich beutlich self-assigned this Nov 11, 2019
HansOlsson
HansOlsson approved these changes Nov 12, 2019
View reviewed changes
Copy link
Contributor

@HansOlsson HansOlsson left a comment •
edited

Choose a reason for hiding this comment

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

Seems ok.
A minor additional consequence is that if someone defined NO_FILE_SYSTEM and _POSIX_VERSION it previously also defined _POSIX_, but that is no longer the case. I don't see if that is important.

sjoelund
sjoelund approved these changes Nov 12, 2019
View reviewed changes
Copy link
Member

@sjoelund sjoelund left a comment

Choose a reason for hiding this comment

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

Seems OK. But it's a bit hard to read the file and see what is part of which ifdef now

@beutlich beutlich merged commit fdccbd0 into modelica:master Nov 12, 2019
@beutlich beutlich deleted the cleanup-includes branch November 12, 2019 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjoelund sjoelund sjoelund approved these changes

@HansOlsson HansOlsson HansOlsson approved these changes

Assignees

@beutlich beutlich

Labels
enhancement New feature or enhancement L: C-Sources Issue addresses Modelica/Resources/C-Sources
Projects
None yet
Milestone
MSL4.0.0
Development

Successfully merging this pull request may close these issues.

ModelicaInternal.c and NO_FILE_SYSTEM
3 participants
@beutlich @sjoelund @HansOlsson