[svn-commits] russell: trunk r164309 - in /trunk: channels/h323/ include/asterisk/

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Dec 15 11:21:38 2008
New Revision: 164309

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164309
Log:
Fix a couple more build issues related to ast_str_opaque

Modified:
    trunk/channels/h323/ast_h323.cxx
    trunk/include/asterisk/strings.h

Modified: trunk/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/ast_h323.cxx?view=diff&rev=164309&r1=164308&r2=164309
==============================================================================
--- trunk/channels/h323/ast_h323.cxx (original)
+++ trunk/channels/h323/ast_h323.cxx Mon Dec 15 11:21:38 2008
@@ -28,6 +28,9 @@
  *
  * Version Info: $Id$
  */
+
+#include "asterisk.h"
+
 #include <arpa/inet.h>
 
 #include <list>

Modified: trunk/include/asterisk/strings.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/strings.h?view=diff&rev=164309&r1=164308&r2=164309
==============================================================================
--- trunk/include/asterisk/strings.h (original)
+++ trunk/include/asterisk/strings.h Mon Dec 15 11:21:38 2008
@@ -481,7 +481,7 @@
 {
 #ifdef DEBUG_OPAQUE
 	if (len < 0) {
-		buf->used2 += (ssize_t) abs(len) > buf->used2 ? -buf->used2 : len;
+		buf->used2 += ((ssize_t) abs(len)) > buf->used2 ? -buf->used2 : len;
 	} else {
 		buf->used2 = len;
 	}
@@ -489,7 +489,7 @@
 	return buf->str2;
 #else
 	if (len < 0) {
-		buf->used += (ssize_t) abs(len) > buf->used ? -buf->used : len;
+		buf->used += ((ssize_t) abs(len)) > buf->used ? -buf->used : len;
 	} else {
 		buf->used = len;
 	}