[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-video-cvs
Subject:    [Video-cvs] sitelib/pub/platform/unix miniandroidsurf.h, 1.4,
From:       qluo () helixcommunity ! org
Date:       2009-12-04 19:33:30
Message-ID: 200912042046.nB4KkFUG027210 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/video/sitelib/pub/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv3287/pub/platform/unix

Modified Files:
      Tag: hxclient_4_0_1_brizo
	miniandroidsurf.h miniandroidsurf_omap3.h 
Log Message:
merge build fix for android eclair to branch.  CR:sfu@real.com


Index: miniandroidsurf_omap3.h
===================================================================
RCS file: /cvsroot/video/sitelib/pub/platform/unix/miniandroidsurf_omap3.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- miniandroidsurf_omap3.h	10 Oct 2009 14:06:38 -0000	1.1
+++ miniandroidsurf_omap3.h	4 Dec 2009 19:33:27 -0000	1.1.2.1
@@ -55,8 +55,13 @@
 
 // android includes
 #include <ui/ISurface.h>
+#if defined(ANDROID_ECLAIR)
+#include <binder/MemoryBase.h>
+#include <binder/MemoryHeapBase.h>
+#else
 #include <utils/MemoryBase.h>
 #include <utils/MemoryHeapBase.h>
+#endif
 #include <ui/Overlay.h>
 
 // for TI overlay

Index: miniandroidsurf.h
===================================================================
RCS file: /cvsroot/video/sitelib/pub/platform/unix/miniandroidsurf.h,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -d -r1.4 -r1.4.8.1
--- miniandroidsurf.h	3 Jun 2009 20:15:53 -0000	1.4
+++ miniandroidsurf.h	4 Dec 2009 19:33:27 -0000	1.4.8.1
@@ -55,9 +55,15 @@
 
 //Android includes
 #include <ui/ISurface.h>
+#if defined(ANDROID_ECLAIR)
+#include <binder/MemoryBase.h>
+#include <binder/MemoryHeapBase.h>
+#include <binder/MemoryHeapPmem.h>
+#else
 #include <utils/MemoryBase.h>
 #include <utils/MemoryHeapBase.h>
 #include <utils/MemoryHeapPmem.h>
+#endif
 using namespace android;
 
 class CMiniAndroidSurface : public CMiniBaseSurface


_______________________________________________
Video-cvs mailing list
Video-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/video-cvs
[prev in list] [next in list] [prev in thread] [next in thread]