--- ptlib/src/ptlib/common/contain.cxx.old	2010-05-14 18:30:16.555432540 +0800
+++ ptlib/src/ptlib/common/contain.cxx	2010-05-14 18:30:31.155098801 +0800
@@ -67,7 +67,7 @@
 {
   public:
     Type * Allocate(size_t n)
-    { return a.allocate(n); }
+    { return (Type*)a.allocate(n); }
 
     void Deallocate(Type * p, size_t n)
     { a.deallocate(p, n); }
--- ptlib/configure.ac.old	2010-05-14 21:15:14.623686373 +0800
+++ ptlib/configure.ac	2010-05-14 21:10:25.723587847 +0800
@@ -263,6 +263,7 @@
   solaris* | sunos* ) OSTYPE=solaris ;
 		   OS_TAG="P_SOLARIS" ;
                    OSRELEASE=`uname -r | sed "s/5\.//g"` ;
+                   STDCCFLAGS="$STDCCFLAGS -D__inline=inline -DSOLARIS"
                    need_pragma=yes ;
 		   AC_DEFINE(P_PTHREADS, 1, "PThreads found")
                    dnl According to Andre Schulze <as8@rncmm2.urz.tu-dresden.de>
