Add all renamed symbols to unixsupport.h #11336
Conversation
Remainining functions for the Unix implementation of the library.
dra27
force-pushed
the
unix-header-compat
branch
from
de4a88a
to
dbf1aa4
Compare
| #define win_alloc_handle caml_win32_alloc_handle | ||
| #define win_alloc_socket caml_win32_alloc_socket | ||
| #define win_CRT_fd_of_filedescr caml_win32_CRT_fd_of_filedescr | ||
| #define win32_maperr caml_win32_maperr |
There was a problem hiding this comment.
The win32_maperr macri is also defined at line 78.
There was a problem hiding this comment.
Good catch - in fact, that macro not being guarded on L78 in the same way as the others means that there was a renaming missing in socket_win32.c (presumably a rebase artefact during the original PR)
dra27
force-pushed
the
unix-header-compat
branch
from
dbf1aa4
to
5585050
Compare
dra27
force-pushed
the
unix-header-compat
branch
from
5585050
to
e5871d1
Compare
There was a problem hiding this comment.
All compatibility macros are here. It does make sense to not break user code when possible.
However, reviewing this PR, I was left wondering if we should offer a mechanism for hiding those compatibility macros outside of defining CAML_BUILDING_UNIX variable (which sounds like a very internal setting).
Add all renamed symbols to unixsupport.h (cherry picked from commit 1916810)
I'd been thinking about this, too. My rationale at the moment is that the present changes are about changing the linking symbols in the library (i.e. we've fixed the .a files) and then removing from the headers is a separate fix. I was thinking of putting something together for 5.1 to deprecate those symbols but we should also learn the "lessons" of
Yes, definitely - there's no expectation on user code to do this, it's just to prevent our code from inadvertently using the old symbols. |
Small follow-on from #10926, spotted in ocsigen/lwt#953. Most of the functions declared in
unixsupport.hwhich were renamed had compatibility macros added as part of the original PR, but a few got missed.This PR tidies
unixsupport.hslightly to put them in one place and adds#definefor all of the symbols which were renamed.The only other public header from the unix library is
socketaddr.hwhich already has all of these handled.