commit 8ad84a849a20124440620ba0486c5365a7375945
author Sergio Giro <sgiro@google.com> Wed Sep 23 22:03:30 2015 +0100
committer Sergio Giro <sgiro@google.com> Wed Sep 23 22:03:30 2015 +0100
tree 5f4d5774e16fb8e141741afda40601f799b3cbf8
parent bd4691c5d558fa0a75c9ed011ee2165c031c9709
parent 0fc7a3a9fa0f4e9fd56f69bf9e4bda91f8de4a55

resolved conflicts for 8dba9a7b to master

Change-Id: I314e3fc4dffbff1f7030533a821696692d03b33d

libutils/SharedBufferTest.cpp

diff --git a/libutils/SharedBufferTest.cpp b/libutils/SharedBufferTest.cpp
index 1919e77..33a4e0c 100644
--- a/libutils/SharedBufferTest.cpp
+++ b/libutils/SharedBufferTest.cpp
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-#include <utils/SharedBuffer.h>
+#define __STDC_LIMIT_MACROS
 
 #include <gtest/gtest.h>
 
 #include <memory>
 #include <stdint.h>
 
+#include "SharedBuffer.h"
+
 TEST(SharedBufferTest, TestAlloc) {
   EXPECT_DEATH(android::SharedBuffer::alloc(SIZE_MAX), "");
   EXPECT_DEATH(android::SharedBuffer::alloc(SIZE_MAX - sizeof(android::SharedBuffer)), "");