diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-15 19:48:02 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-15 19:48:02 +0000 |
| commit | 42e26ee70050c3df692c931356f9edb7fe162c6f (patch) | |
| tree | cefbdb1587ef57d7c253fc5a12c9e051598ee6d6 /include | |
| parent | 203e224bcb5c1d6b6e525bae8f4d19920aa4ecc0 (diff) | |
Revert ast_str opacity in chan_sip for now, since something wasn't quite right
in the merge.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@164417 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/strings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index 0001c964c..18b363b75 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -23,7 +23,7 @@ #ifndef _ASTERISK_STRINGS_H #define _ASTERISK_STRINGS_H -#define DEBUG_OPAQUE +/* #define DEBUG_OPAQUE */ #include <ctype.h> @@ -32,7 +32,7 @@ /* You may see casts in this header that may seem useless but they ensure this file is C++ clean */ -#define AS_OR(a,b) ast_str_strlen(a) ? ast_str_buffer(a) : (b) +#define AS_OR(a,b) (a && ast_str_strlen(a)) ? ast_str_buffer(a) : (b) #ifdef AST_DEVMODE #define ast_strlen_zero(foo) _ast_strlen_zero(foo, __FILE__, __PRETTY_FUNCTION__, __LINE__) |