[asterisk-commits] jpeeler: branch may/chan_ooh323_rework r226525 - /team/may/chan_ooh323_rework...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Oct 29 11:05:48 2009
New Revision: 226525

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=226525
Log:
a few last dev-mode compile fixes, thanks for taking care of the rest, may

Modified:
    team/may/chan_ooh323_rework/addons/ooh323c/src/ooSocket.c
    team/may/chan_ooh323_rework/addons/ooh323c/src/ooasn1.h

Modified: team/may/chan_ooh323_rework/addons/ooh323c/src/ooSocket.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/ooh323c/src/ooSocket.c?view=diff&rev=226525&r1=226524&r2=226525
==============================================================================
--- team/may/chan_ooh323_rework/addons/ooh323c/src/ooSocket.c (original)
+++ team/may/chan_ooh323_rework/addons/ooh323c/src/ooSocket.c Thu Oct 29 11:05:48 2009
@@ -180,7 +180,7 @@
 defined(_HP_UX) || defined(__hpux) || defined(_HPUX_SOURCE)
 typedef int OOSOCKLEN;
 #else
-typedef size_t OOSOCKLEN;
+typedef socklen_t OOSOCKLEN;
 #endif
 
 int ooSocketCreate (OOSOCKET* psocket) 

Modified: team/may/chan_ooh323_rework/addons/ooh323c/src/ooasn1.h
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/ooh323c/src/ooasn1.h?view=diff&rev=226525&r1=226524&r2=226525
==============================================================================
--- team/may/chan_ooh323_rework/addons/ooh323c/src/ooasn1.h (original)
+++ team/may/chan_ooh323_rework/addons/ooh323c/src/ooasn1.h Thu Oct 29 11:05:48 2009
@@ -544,9 +544,15 @@
 
 
 #define DE_BIT(pctxt,pvalue) \
+((DE_INCRBITIDX (pctxt) != ASN_OK) ? ASN_E_ENDOFBUF : ( \
+((*(pvalue) = (((pctxt)->buffer.data[(pctxt)->buffer.byteIndex]) & \
+(1 << (pctxt)->buffer.bitOffset)) != 0), ASN_OK) ))
+/*
+#define DE_BIT(pctxt,pvalue) \
 ((DE_INCRBITIDX (pctxt) != ASN_OK) ? ASN_E_ENDOFBUF : ((pvalue) ? \
 ((*(pvalue) = (((pctxt)->buffer.data[(pctxt)->buffer.byteIndex]) & \
 (1 << (pctxt)->buffer.bitOffset)) != 0), ASN_OK) : ASN_OK ))
+*/
 
 
 #define encodeIA5String(pctxt,value,permCharSet) \
@@ -1008,9 +1014,15 @@
 ((pctxt)->buffer.bitOffset = 7, ASN_OK)) : ASN_OK)
 
 #define DECODEBIT(pctxt,pvalue) \
+((INCRBITIDX (pctxt) != ASN_OK) ? ASN_E_ENDOFBUF : ( \
+((*(pvalue) = (((pctxt)->buffer.data[(pctxt)->buffer.byteIndex]) & \
+(1 << (pctxt)->buffer.bitOffset)) != 0), ASN_OK) ))
+/*
+#define DECODEBIT(pctxt,pvalue) \
 ((INCRBITIDX (pctxt) != ASN_OK) ? ASN_E_ENDOFBUF : ((pvalue) ? \
 ((*(pvalue) = (((pctxt)->buffer.data[(pctxt)->buffer.byteIndex]) & \
 (1 << (pctxt)->buffer.bitOffset)) != 0), ASN_OK) : ASN_OK ))
+*/
 
 /*
 #define SETCHARSET(csetvar, canset, abits, ubits) \