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

Jump to bottom

[MSDOS] name-clash in url.c #9585

Closed
wants to merge 3 commits into from
Closed

[MSDOS] name-clash in url.c #9585

wants to merge 3 commits into from

Conversation

gvanem
Copy link
Contributor

@gvanem gvanem commented Sep 24, 2022

In commit 764c958, the new function resolve_ip()
clashes with an internal function in Watt-32. Hence undefine it in libcurl.

@gvanem
[MSDOS] name-clash in url.c
9b0da1d 
Since the commit 764c958, there was a new
function resolve_ip(). This clashes with an internal function in Watt-32. Hence undefine it in libcurl.
@bagder
Copy link
Member

bagder commented Sep 24, 2022

Since resolve_ip is a static function in url.c, wouldn't it be a cleaner fix to just add #undef resolve_ip /* avoid a Watt-32 duplicate symbol */ just before the function declaration in that file?

@dfandrich
Copy link
Contributor

dfandrich commented Sep 24, 2022 via email

@bagder
Copy link
Member

bagder commented Sep 24, 2022

Or just rename the function?

oh yes, that's actually even better

@gvanem
Copy link
Contributor Author

gvanem commented Sep 25, 2022

oh yes, that's actually even better

Ok. Fine by me.

@vszakats vszakats added the build label Sep 25, 2022
@gvanem
Copy link
Contributor Author

gvanem commented Sep 26, 2022 •
edited

Perhaps I misunderstood something. Should I rename resolve_ip() in url.c to avoid this name-clash?
Edit: done below.

@gvanem
'resolve_ip()' -> 'resolve_host()'
867f11f 
Rename the function to what it actually does.
MarcelRaad
MarcelRaad reviewed Sep 26, 2022
View reviewed changes
lib/curl_setup.h Outdated Show resolved Hide resolved
@gvanem
Revert previous change
bafb0db 
No need now for `#undef resolve_ip`.
@bagder
Copy link
Member

bagder commented Sep 26, 2022

Thanks!

@bagder bagder closed this in 2481dbe Sep 26, 2022
@bagder bagder deleted the djgpp-fix branch September 26, 2022 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarcelRaad MarcelRaad MarcelRaad approved these changes

@bagder bagder bagder approved these changes

Assignees
No one assigned
Labels
build
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@gvanem @bagder @dfandrich @MarcelRaad @vszakats