From 9bc7973e3893a72a62e75b8c7075d692c8794ec1 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Wed, 23 Jan 2019 17:16:31 -0800
Subject: Fixes for Google import.

---
 upb/handlers-inl.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'upb')

diff --git a/upb/handlers-inl.h b/upb/handlers-inl.h
index 5677a4a..40a0047 100644
--- a/upb/handlers-inl.h
+++ b/upb/handlers-inl.h
@@ -7,6 +7,8 @@
 #define UPB_HANDLERS_INL_H_
 
 #include <limits.h>
+#include <stddef.h>
+#include "upb/handlers.h"
 
 #ifdef __cplusplus
 
@@ -162,8 +164,8 @@ struct FuncInfo {
  * These functions are not bound to a handler data so have no data or cleanup
  * handler. */
 struct UnboundFunc {
-  CleanupFunc *GetCleanup() { return NULL; }
-  void *GetData() { return NULL; }
+  CleanupFunc *GetCleanup() { return nullptr; }
+  void *GetData() { return nullptr; }
 };
 
 template <class R, class P1, R F(P1), class I>
-- 
cgit v1.2.3