From 92fcfd7a6f021021155da80cdeae3fbbc486ef53 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Thu, 26 May 2011 14:47:28 +0000 Subject: [PATCH] Fixed two compilation errors with different opt.h settings --- src/api/sockets.c | 4 ++-- src/core/tcp_out.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/api/sockets.c b/src/api/sockets.c index d0b15b89..7e25f7a4 100644 --- a/src/api/sockets.c +++ b/src/api/sockets.c @@ -908,10 +908,10 @@ lwip_sendto(int s, const void *data, size_t size, int flags, #if LWIP_UDP #if LWIP_CHECKSUM_ON_COPY && LWIP_NETIF_TX_SINGLE_PBUF err = sock->conn->last_err = udp_sendto_chksum(sock->conn->pcb.udp, p, - remote_addr, remote_port, 1, chksum); + ipX_2_ip(remote_addr), remote_port, 1, chksum); #else /* LWIP_CHECKSUM_ON_COPY && LWIP_NETIF_TX_SINGLE_PBUF */ err = sock->conn->last_err = udp_sendto(sock->conn->pcb.udp, p, - remote_addr, remote_port); + ipX_2_ip(remote_addr), remote_port); #endif /* LWIP_CHECKSUM_ON_COPY && LWIP_NETIF_TX_SINGLE_PBUF */ #else /* LWIP_UDP */ err = ERR_ARG; diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c index d9ab0a92..aeb0bc65 100644 --- a/src/core/tcp_out.c +++ b/src/core/tcp_out.c @@ -1169,7 +1169,6 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb) seg->tcphdr->chksum = ipX_chksum_pseudo(PCB_ISIPV6(pcb), seg->p, IP_PROTO_TCP, seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip); #endif /* CHECKSUM_GEN_TCP */ - } #endif /* TCP_CHECKSUM_ON_COPY */ TCP_STATS_INC(tcp.xmit);