[asterisk-commits] tilghman: branch 1.6.0 r136948 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Aug  9 10:27:11 2008
New Revision: 136948

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136948
Log:
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

........

................

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/astobj2.h
    branches/1.6.0/include/asterisk/compat.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/astobj2.h?view=diff&rev=136948&r1=136947&r2=136948
==============================================================================
--- branches/1.6.0/include/asterisk/astobj2.h (original)
+++ branches/1.6.0/include/asterisk/astobj2.h Sat Aug  9 10:27:11 2008
@@ -16,6 +16,8 @@
 
 #ifndef _ASTERISK_ASTOBJ2_H
 #define _ASTERISK_ASTOBJ2_H
+
+#include "asterisk/compat.h"
 
 /*! \file 
  * \ref AstObj2

Modified: branches/1.6.0/include/asterisk/compat.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/compat.h?view=diff&rev=136948&r1=136947&r2=136948
==============================================================================
--- branches/1.6.0/include/asterisk/compat.h (original)
+++ branches/1.6.0/include/asterisk/compat.h Sat Aug  9 10:27:11 2008
@@ -163,6 +163,7 @@
 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 */