Diff: if/lwip/lwipNetTcpSocket.cpp

Revision:

2:a4f97773c90f

Parent:

0:632c9925f013

Child:

5:dd63a1e02b1b

--- a/if/lwip/lwipNetTcpSocket.cpp	Mon Jun 14 10:33:54 2010 +0000
+++ b/if/lwip/lwipNetTcpSocket.cpp	Fri Jun 18 09:22:54 2010 +0000
@@ -30,7 +30,7 @@
 #include "netCfg.h"
 #if NET_LWIP_STACK
 
-LwipNetTcpSocket::LwipNetTcpSocket(tcp_pcb* pPcb /*= NULL*/) : m_pPcb(pPcb), m_lpInNetTcpSocket(), //Passes a pcb if already created (by an accept req for instance), in that case transfers ownership
+LwipNetTcpSocket::LwipNetTcpSocket(tcp_pcb* pPcb /*= NULL*/) : NetTcpSocket(), m_pPcb(pPcb), m_lpInNetTcpSocket(), //Passes a pcb if already created (by an accept req for instance), in that case transfers ownership
 m_pReadPbuf(NULL)
 {
   DBG("\r\nNew NetTcpSocket %p\r\n", (void*)this);
@@ -163,8 +163,8 @@
   return NETTCPSOCKET_OK;
 }
 
-#define MAX(a,b) ((a>b)?a:b)
-#define MIN(a,b) ((a<b)?a:b)
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#define MIN(a,b) (((a)<(b))?(a):(b))
 
 int /*if < 0 : NetTcpSocketErr*/ LwipNetTcpSocket::send(const char* buf, int len)
 {