diff options
| author | 2009-10-30 13:53:32 -0400 | |
|---|---|---|
| committer | 2009-10-30 13:53:32 -0400 | |
| commit | b00e33d1155464c640cd1f5e395b7cb315a00ccc (patch) | |
| tree | cc2aae8a08b6e1429c456596bcbfcba6485b1618 | |
| parent | db5fcfd0644227aebd0b1201abd9c23a93a77660 (diff) | |
| parent | 550a11455a5155b078085fd5f464d7f3e5dfb7fc (diff) | |
Merge change I08c19bee into eclair
* changes:
DO NOT MERGE: Another gcc 4.0.3 workaround.
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/libs/surfaceflinger/SurfaceFlinger.h index 6698e003c3..f9bfe6c7c3 100644 --- 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 |