summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-07-04 06:10:45 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-07-04 06:10:45 +0000
commitf5e6465011653cc6301c44072cb095b45a1eb788 (patch)
tree183a7daf9d32652209d7440014f1cfac4c220edb
parent7b583f419c86e2cde404dd8277a77d42d64c5656 (diff)
parent99703ab948d16a83979d70d595e48cc5a0f06880 (diff)
downloadsrc-f5e6465011653cc6301c44072cb095b45a1eb788.tar.gz
Merge third_party/mesa/src from https://chromium.googlesource.com/chromium/deps/mesa.git at 99703ab948d16a83979d70d595e48cc5a0f06880
This commit was generated by merge_from_chromium.py. Change-Id: I32908701d785f1e29810ce6f28e3007e38cefe09
-rw-r--r--src/gallium/auxiliary/util/u_debug.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index 06470f6..583984f 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -39,6 +39,7 @@
#define U_DEBUG_H_
+#include <assert.h>
#include "os/os_misc.h"