Commit de2e0f4
committed
Use slirp_pollfds_fill_socket on libslirp >= 4.9.0
slirp_pollfds_fill and its int-based SlirpAddPollCb callback were
deprecated in libslirp 4.9.0 in favour of slirp_pollfds_fill_socket and
SlirpAddPollSocketCb, which carry the descriptor as a slirp_os_socket.
Building against libslirp >= 4.9.0 therefore emits a
-Wdeprecated-declarations warning in vReceiveThread.
Guard the poll-fill call and the add-poll callback signature on
SLIRP_CHECK_VERSION( 4, 9, 0 ) so modern libslirp uses the socket-based
API while older versions keep the existing behaviour.
Fixes #13251 parent da707f2 commit de2e0f4
1 file changed
Lines changed: 17 additions & 6 deletions
Lines changed: 17 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
575 | 575 | | |
576 | 576 | | |
577 | 577 | | |
578 | | - | |
579 | | - | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
580 | 581 | | |
581 | 582 | | |
582 | 583 | | |
583 | | - | |
584 | | - | |
585 | | - | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
586 | 593 | | |
587 | 594 | | |
588 | 595 | | |
| |||
706 | 713 | | |
707 | 714 | | |
708 | 715 | | |
709 | | - | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
710 | 721 | | |
711 | 722 | | |
712 | 723 | | |
| |||
0 commit comments