Now sure how we mismerged these, but we have two sets of prototypes. Remove one.
Signed-off-by: Warner Losh <[email protected]> --- bsd-user/qemu-bsd.h | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/bsd-user/qemu-bsd.h b/bsd-user/qemu-bsd.h index f7c8338213..cdd27b44b4 100644 --- a/bsd-user/qemu-bsd.h +++ b/bsd-user/qemu-bsd.h @@ -50,29 +50,40 @@ abi_long target_to_host_msqid_ds(struct msqid_ds *host_md, abi_long host_to_target_msqid_ds(abi_ulong target_addr, struct msqid_ds *host_md); -/* bsd-mem.c */ -void target_to_host_ipc_perm__locked(struct ipc_perm *host_ip, - struct target_ipc_perm *target_ip); -void host_to_target_ipc_perm__locked(struct target_ipc_perm *target_ip, - struct ipc_perm *host_ip); -abi_long target_to_host_shmid_ds(struct shmid_ds *host_sd, - abi_ulong target_addr); -abi_long host_to_target_shmid_ds(abi_ulong target_addr, - struct shmid_ds *host_sd); +/* bsd-socket.c */ +abi_long target_to_host_sockaddr(struct sockaddr *addr, abi_ulong target_addr, + socklen_t len); +abi_long host_to_target_sockaddr(abi_ulong target_addr, struct sockaddr *addr, + socklen_t len); +abi_long target_to_host_ip_mreq(struct ip_mreqn *mreqn, abi_ulong target_addr, + socklen_t len); /* bsd-misc.c */ abi_long host_to_target_uuid(abi_ulong target_addr, struct uuid *host_uuid); + abi_long target_to_host_semarray(int semid, unsigned short **host_array, abi_ulong target_addr); abi_long host_to_target_semarray(int semid, abi_ulong target_addr, unsigned short **host_array); + abi_long target_to_host_semid_ds(struct semid_ds *host_sd, abi_ulong target_addr); abi_long host_to_target_semid_ds(abi_ulong target_addr, struct semid_ds *host_sd); + abi_long target_to_host_msqid_ds(struct msqid_ds *host_md, abi_ulong target_addr); abi_long host_to_target_msqid_ds(abi_ulong target_addr, struct msqid_ds *host_md); +/* bsd-mem.c */ +void target_to_host_ipc_perm__locked(struct ipc_perm *host_ip, + struct target_ipc_perm *target_ip); +void host_to_target_ipc_perm__locked(struct target_ipc_perm *target_ip, + struct ipc_perm *host_ip); +abi_long target_to_host_shmid_ds(struct shmid_ds *host_sd, + abi_ulong target_addr); +abi_long host_to_target_shmid_ds(abi_ulong target_addr, + struct shmid_ds *host_sd); + #endif /* QEMU_BSD_H */ -- 2.52.0
