diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-05-15 12:47:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 12:47:41 -0500 |
| commit | 184cc8ecfa5767577844f452e7d645465650df10 (patch) | |
| tree | 87772b59a9f1a62a1140fab7bbeded50eef3f536 /upb | |
| parent | 04350e1d1b7ff5457b1a36150d98d5a5efc0ed89 (diff) | |
| parent | a126b9a046d8a5e0b73e363d815ae45f0ae748b6 (diff) | |
Merge pull request #167 from haberman/bazel25
Fixes to make upb and upb_proto_library() work with Blaze inside Google
Diffstat (limited to 'upb')
| -rw-r--r-- | upb/handlers-inl.h | 4 | ||||
| -rw-r--r-- | upb/handlers.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/upb/handlers-inl.h b/upb/handlers-inl.h index 40a0047..8f8634b 100644 --- a/upb/handlers-inl.h +++ b/upb/handlers-inl.h @@ -10,6 +10,8 @@ #include <stddef.h> #include "upb/handlers.h" +#include "upb/port_def.inc" + #ifdef __cplusplus /* Type detection and typedefs for integer types. @@ -916,4 +918,6 @@ inline void Handler<T>::AddCleanup(upb_handlers* h) const { #undef UPB_INT64ALT_T #undef UPB_UINT64ALT_T +#include "upb/port_undef.inc" + #endif /* UPB_HANDLERS_INL_H_ */ diff --git a/upb/handlers.h b/upb/handlers.h index 856be31..2d2380b 100644 --- a/upb/handlers.h +++ b/upb/handlers.h @@ -725,8 +725,8 @@ bool upb_msg_getscalarhandlerdata(const upb_handlers *h, } /* extern "C" */ #endif -#include "upb/handlers-inl.h" - #include "upb/port_undef.inc" +#include "upb/handlers-inl.h" + #endif /* UPB_HANDLERS_H */ |