diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 15:27:11 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-09 15:27:11 +0000 |
| commit | cb8edbccd41008c0a099bd5c25c414d4831066b5 (patch) | |
| tree | 2ca8a0813ccbf8c36944206c3733603db4464f35 | |
| parent | c3bdb3b44d0ccf5c7f424a4ffce82e4653e4419e (diff) | |
Merged revisions 136947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r136947 | tilghman | 2008-08-09 10:26:27 -0500 (Sat, 09 Aug 2008) | 18 lines
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/branches/1.6.0@136948 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 b02b6cba8..5899885df 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 */ |