Skip to content

Reexport NML headers - #4852

Open
BsAtHome wants to merge 2 commits into
LinuxCNC:masterfrom
BsAtHome:fix_reexport-nml-headers
Open

BsAtHome wants to merge 2 commits into
LinuxCNC:masterfrom
BsAtHome:fix_reexport-nml-headers

Conversation

@BsAtHome

Copy link
Copy Markdown
Contributor

This PR reexports the NML headers. It does so by putting them in the include/libnml/... and include/nml_intf/ hierarchies. If someone needs it to be flattened, then they can simply add the appropriate -I options to their private compile job (we got rid of most of them for good reason).

The reexport also fixes collision prone double inclusion protection by using a proper prefix. All the #include directives have been updated to use the proper <> style for the moved includes, unless an include file target is local to the directory of the file being compiled (and that also goes for includes including includes).

This PR should fix some of the problems of #4774. There are many more changes and fixes to the NML stuff between 2.9 and master. Any use needs very, very careful attention if you try to interface using the binary interface and try to port 2.9 code to master and future 2.10.

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.

1 participant