From b7571f835daf978b2f403efcd60a567ea218c8ec Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 9 Aug 2008 15:26:27 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@136947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 include/asterisk/astobj2.h | 2 ++
 include/asterisk/compat.h  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index ddf29c7e19..fd22b3be49 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 950712060b..e481fbec4b 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 */
-- 
GitLab