diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 15:26:27 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 15:26:27 +0000 |
| commit | a7d5d823269faeaf473f874362aa8cb8b627f2c8 (patch) | |
| tree | 20ae0cb5ec67c9c7469ee1d3f206299aa67839c7 /include | |
| parent | 3d55cb9df3d68aaf7b6c118a35eefca66a89f93d (diff) | |
Merged revisions 136946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r136946 | tilghman | 2008-08-09 10:25:36 -0500 (Sat, 09 Aug 2008) | 10 lines
Merged revisions 136945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r136945 | tilghman | 2008-08-09 10:24:36 -0500 (Sat, 09 Aug 2008) | 2 lines
Regression fixes for Solaris
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136947 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/astobj2.h | 2 | ||||
| -rw-r--r-- | include/asterisk/compat.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index ddf29c7e1..fd22b3be4 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -17,6 +17,8 @@ #ifndef _ASTERISK_ASTOBJ2_H #define _ASTERISK_ASTOBJ2_H +#include "asterisk/compat.h" + /*! \file * \ref AstObj2 * diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 950712060..e481fbec4 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -163,6 +163,7 @@ size_t strlcpy(char *dst, const char *src, size_t siz); typedef unsigned char u_int8_t; typedef unsigned short u_int16_t; typedef unsigned int u_int32_t; +typedef unsigned int uint; #endif #endif /* SOLARIS */ |