diff options
| author | Colin Cross <ccross@android.com> | 2017-04-07 10:50:33 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-04-07 11:01:22 -0700 |
| commit | d7c3ad1d95c38b33c49a462f2647dc10f1fff7b7 (patch) | |
| tree | a77368b5efd882b6d7c224d8fd9f5b6948d48071 /cpp/src/sfntly/port/file_input_stream.cc | |
| parent | d4aea7c865084a140a965d4c413c6c38f9a2743a (diff) | |
| parent | 64f78562d2003eb7cacaaa86a398cbd41881ba6f (diff) | |
| download | sfntly-d7c3ad1d95c38b33c49a462f2647dc10f1fff7b7.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into master
Bug: 32096780
Test: mmma -j external/skia
Change-Id: Ia60d7b9984c1007e82bfea10c1a6df32418100d5
(cherry picked from commit bd503d67f403ca1e1d33226626c494d5513701e4)
Diffstat (limited to 'cpp/src/sfntly/port/file_input_stream.cc')
| -rw-r--r-- | cpp/src/sfntly/port/file_input_stream.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/sfntly/port/file_input_stream.cc b/cpp/src/sfntly/port/file_input_stream.cc index 5bcb434..dfe9a7b 100644 --- a/cpp/src/sfntly/port/file_input_stream.cc +++ b/cpp/src/sfntly/port/file_input_stream.cc @@ -18,6 +18,8 @@ #include <windows.h> #endif +#include <algorithm> + #include "sfntly/port/file_input_stream.h" #include "sfntly/port/exception_type.h" |