diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 15:25:36 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 15:25:36 +0000 |
commit | 6f4192f273e1f2c495e1bf508ee6cc1c3927e3af (patch) | |
tree | 0ba2146195e221a94be2cd450c6844cd899e697f | |
parent | 1ba97a6d31fb24ab6c898c80a829a9a530a3558b (diff) |
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/branches/1.4@136946 f38db490-d61c-443f-a65b-d21fe96a405b
-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 bcb8addda..ca05141b5 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 * * \brief Object Model implementing objects and containers. diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 2c131527d..22261a390 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -109,6 +109,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 */ |