diff options
| author | 2017-03-11 01:26:24 +0000 | |
|---|---|---|
| committer | 2017-03-11 01:26:25 +0000 | |
| commit | 5f842f492a05e5408556641dc6eb68c09d1cc361 (patch) | |
| tree | fdf8c0f18e18848026e51939e4c6779a0ea372a9 | |
| parent | 47ec28647af5ce9d7079ee2ab782cf42e6299cad (diff) | |
| parent | ea969d53ddd53a8f125e6f2d10074c2f4a0b6554 (diff) | |
Merge changes from topic 'libutils-remove-string'
* changes:
RegionHelper.h: include <limits> directly.
opengl egl_object.h: add <atomic> include.
| -rw-r--r-- | include/private/ui/RegionHelper.h | 1 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_object.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/private/ui/RegionHelper.h b/include/private/ui/RegionHelper.h index a22b2cbd30..a86c586593 100644 --- a/include/private/ui/RegionHelper.h +++ b/include/private/ui/RegionHelper.h @@ -17,6 +17,7 @@ #ifndef ANDROID_UI_PRIVATE_REGION_HELPER_H #define ANDROID_UI_PRIVATE_REGION_HELPER_H +#include <limits> #include <stdint.h> #include <sys/types.h> diff --git a/opengl/libs/EGL/egl_object.h b/opengl/libs/EGL/egl_object.h index f4012abb39..f452969a17 100644 --- a/opengl/libs/EGL/egl_object.h +++ b/opengl/libs/EGL/egl_object.h @@ -17,6 +17,7 @@ #ifndef ANDROID_EGL_OBJECT_H #define ANDROID_EGL_OBJECT_H +#include <atomic> #include <stdint.h> #include <stddef.h> |