[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/rtsp rtspmsg2.cpp,1.22,1.22.8.1
From:       dcollins () helixcommunity ! org
Date:       2012-05-25 19:17:49
[Download RAW message or body]

Update of /cvsroot/server/protocol/rtsp
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11084/protocol/rtsp

Modified Files:
      Tag: SERVER_NUCLEUS
	rtspmsg2.cpp 
Log Message:
Use HX_MIN() and HX_MAX(), rather then min() and max(), for better portability


Index: rtspmsg2.cpp
===================================================================
RCS file: /cvsroot/server/protocol/rtsp/rtspmsg2.cpp,v
retrieving revision 1.22
retrieving revision 1.22.8.1
diff -u -d -r1.22 -r1.22.8.1
--- rtspmsg2.cpp	1 Mar 2011 23:16:28 -0000	1.22
+++ rtspmsg2.cpp	25 May 2012 19:17:47 -0000	1.22.8.1
@@ -859,7 +859,7 @@
 {
     CPBYTE pbuf = pbufLine->GetBuffer() + *ppos;
     UINT32 buflen = pbufLine->GetSize() - *ppos;
-    UINT32 curlen = min(m_ulRecvLeft, buflen);
+    UINT32 curlen = HX_MIN(m_ulRecvLeft, buflen);
 
     if (m_pbufContent == NULL)
     {
@@ -1509,7 +1509,7 @@
     pos += 5;
     while (isdigit(*pcur))
     {
-        nMajor = min(255, nMajor*10 + (*pcur-'0'));
+        nMajor = HX_MIN(255, nMajor*10 + (*pcur-'0'));
         pcur++;
         pos++;
     }
@@ -1522,7 +1522,7 @@
     pos++;
     while (isdigit(*pcur))
     {
-        nMinor = min(255, nMinor*10 + (*pcur-'0'));
+        nMinor = HX_MIN(255, nMinor*10 + (*pcur-'0'));
         pcur++;
         pos++;
     }
@@ -2108,7 +2108,7 @@
         UINT32 uPacketOffset;
         UINT32 uLen;
 
-        uLen = min(m_uRecvLeft, pbufPacket->GetSize());
+        uLen = HX_MIN(m_uRecvLeft, pbufPacket->GetSize());
         uPacketOffset = m_pbufPacket->GetSize() - m_uRecvLeft;
 
         memcpy(m_pbufPacket->GetBuffer()+uPacketOffset, pbuf, uLen);


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]