Fix a couple more build issues related to ast_str_opaque

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@164309 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx
index 2ed94b5c3daf92635c7d407545e63af22bae000e..d61006800d18cc36aafb8a48242f798a828f5fdf 100644 (file)
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -28,6 +28,9 @@
  *
  * Version Info: $Id$
  */
+
+#include "asterisk.h"
+
 #include <arpa/inet.h>
 
 #include <list>

diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 0acc834368109c154f7d0438b704ac8a75d6769e..1b70c15ef969c255689c334ceeb5f3fd524ead84 100644 (file)
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -481,7 +481,7 @@ char *ast_str_truncate(struct ast_str *buf, ssize_t len),
 {
 #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 @@ char *ast_str_truncate(struct ast_str *buf, ssize_t len),
        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;
        }