OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
824838d
)
DO NOT MERGE: Another gcc 4.0.3 workaround.
author
Andy McFadden
<fadden@android.com>
Thu, 29 Oct 2009 17:19:34 +0000
(10:19 -0700)
committer
Andy McFadden
<fadden@android.com>
Fri, 30 Oct 2009 17:24:06 +0000
(10:24 -0700)
Temporarily make a function public that doesn't need to be. When
host gcc-4.0.3 is gone from the build servers we can undo this.
(Cherry-picked from eclair-mr2.)
libs/surfaceflinger/SurfaceFlinger.h
patch
|
blob
|
history
diff --git
a/libs/surfaceflinger/SurfaceFlinger.h
b/libs/surfaceflinger/SurfaceFlinger.h
index
6698e00
..
f9bfe6c
100644
(file)
--- a/
libs/surfaceflinger/SurfaceFlinger.h
+++ b/
libs/surfaceflinger/SurfaceFlinger.h
@@
-246,8
+246,10
@@
private:
virtual status_t readyToRun();
virtual void onFirstRef();
+public: // hack to work around gcc 4.0.3 bug
const GraphicPlane& graphicPlane(int dpy) const;
GraphicPlane& graphicPlane(int dpy);
+private:
void waitForEvent();
public: // hack to work around gcc 4.0.3 bug