diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-12-15 17:21:38 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-12-15 17:21:38 +0000 |
| commit | 808a5fda59d7d81b11600e05bb0fd3ebdb09759f (patch) | |
| tree | 968217f114e8328db688837c0b27a123eade1314 | |
| parent | 12384883193e4930a792be54cc64395301c9e7e9 (diff) | |
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
| -rw-r--r-- | channels/h323/ast_h323.cxx | 3 | ||||
| -rw-r--r-- | include/asterisk/strings.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx index 2ed94b5c3..d61006800 100644 --- 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 0acc83436..1b70c15ef 100644 --- 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; } |