Replace vosproto.h with prototypes from xnames.h #286
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
olebole
changed the title
olebole
force-pushed
the
boot_f2c
branch
3 times, most recently
from
8ac10a0
to
8dae233
Compare
Merged
"integer" is an F2C equivalent to "XINT", which is what we already use use here. This reverts the (IMO unnecessary) change in this file done in 2.16.1.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
vosproto.horiginated from a cproto run of the XC and F2C processed SPP (and Fortran) sources. This causes a few problems: first, it introduces a direct F2C dependency of the prototypes (since the used data types are F2C specific), then it depends on the specific F2C name mangling (i.e. adding an underscore) instead of relying on the canonicalxnames.hname conversion, and third it seems to contain far too many functions.xnames.hclearly states on topiraf/unix/hlib/libc/iraf_xnames.h
Line 2 in 28c1028
which implies that this list is exhaustive.
This PR reduces the number of prototypes to those defined in
xnames.hand also consequently uses SPP type names (XINT & friends). This also removes warnings about redefining things inf2c.h, since this file is no longer required to include.