diff options
author | Sree Kuchibhotla <sreek@google.com> | 2017-01-13 11:24:00 -0800 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2017-01-13 11:24:00 -0800 |
commit | 855f0122bf1b6d5960578bc88c7a3a06a00ac856 (patch) | |
tree | b740802dbf727bb0da701341e8f33bfc1b784776 /test/core | |
parent | 0542d11ea8ab3ffde3458fbf7daf7a2af93b19fa (diff) | |
parent | 6b6954050cf0379dbbee90dd18313a3779e0dd52 (diff) |
Merge branch 'master' into pollset_set_test
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/support/BUILD | 2 | ||||
-rw-r--r-- | test/core/util/memory_counters.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/support/BUILD b/test/core/support/BUILD index 77f0a9a048..dfe952eb37 100644 --- a/test/core/support/BUILD +++ b/test/core/support/BUILD @@ -27,8 +27,6 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer") - cc_test( name = "alloc_test", srcs = ["alloc_test.c"], diff --git a/test/core/util/memory_counters.h b/test/core/util/memory_counters.h index f332816501..b9b2b3adda 100644 --- a/test/core/util/memory_counters.h +++ b/test/core/util/memory_counters.h @@ -34,6 +34,8 @@ #ifndef GRPC_TEST_CORE_UTIL_MEMORY_COUNTERS_H #define GRPC_TEST_CORE_UTIL_MEMORY_COUNTERS_H +#include <stddef.h> + struct grpc_memory_counters { size_t total_size_relative; size_t total_size_absolute; |