diff options
| author | 2009-04-10 14:36:33 -0700 | |
|---|---|---|
| committer | 2009-04-10 14:36:33 -0700 | |
| commit | 0179ff6594034d0355499c048e3a2ea2d515e8b6 (patch) | |
| tree | e1f7634a72c4e6c54bbc4de62287b707d3fd1891 /libs/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 1473f46cbc82aa6f0ba744cc896a36923823d55b (diff) | |
| parent | a8e947f604281197b77e8a9171a9d1fa3d274703 (diff) | |
Merge commit 'goog/master' into master_gl
Conflicts:
libs/utils/Parcel.cpp
Diffstat (limited to 'libs/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index b4f443fda81c..8dca12489beb 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -21,6 +21,7 @@ #include <fcntl.h> #include <errno.h> #include <math.h> +#include <limits.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h> |