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

Add missing macro definitions #4282

Merged
merged 3 commits into from
Jan 26, 2024

Conversation

beutlich
Copy link
Member

Closes #4280.

@beutlich beutlich added L: C-Sources Issue addresses Modelica/Resources/C-Sources V: 4.1.0-dev Issue originates in MSL v4.1.0-dev (and is not present in earlier releases) labels Jan 24, 2024
@beutlich beutlich enabled auto-merge (squash) January 24, 2024 20:59
@beutlich
Copy link
Member Author

Should we add the undefines to the other header files as well?

Copy link
Contributor

@maltelenz maltelenz left a comment

Choose a reason for hiding this comment

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

With this, I was able to build it cleanly (on Linux) with our vendor-provided ModelicaUtilities.h.

Should all of the define stuff be removed from .CI/Test/ModelicaUtilities.h, to more closely resemble a vendor-provided ModelicaUtilities.h, and avoid accidental reliance on these defines?

This comment in the ModelicaUtilities.h is not correct:

   A generic C-implementation of these functions cannot be given,
   because it is tool dependent how strings are output in a
   window of the respective simulation tool. Therefore, only
this header file is shipped with the Modelica Standard Library.

since it is not shipped. To be fair, this PR didn't touch that part.

@beutlich
Copy link
Member Author

This comment in the ModelicaUtilities.h is not correct:

It's updated now.

Should all of the define stuff be removed from .CI/Test/ModelicaUtilities.h,

I prefer to have it as is. After all, it is test code only.

Should we add the undefines to the other header files as well?

From what I checked, it is fine as it is.

@beutlich beutlich merged commit b13e4d6 into modelica:master Jan 26, 2024
2 checks passed
@beutlich beutlich deleted the add-noreturn-macro-defs branch January 26, 2024 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
L: C-Sources Issue addresses Modelica/Resources/C-Sources V: 4.1.0-dev Issue originates in MSL v4.1.0-dev (and is not present in earlier releases)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

C code uses macros specified in internal/hidden ModelicaUtilities.h
3 participants