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: https://origsvn.digium.com/svn/asterisk/branches/1.4@136946 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index bcb8adddae02e9b521857d6d4a796a9cbe533968..ca05141b5fd647f312a02cd62c3fae7285132a76 100644 (file)
--- 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 2c131527d13ed560d6307373d152510279309b87..22261a39070fb5298e49b209a3e28a37844f0dbb 100644 (file)
--- 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 */