From eb9e33ec420c1a4a3de32a0a517a4eca2beb4136 Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Tue, 22 Aug 2023 15:01:44 -0700 Subject: [PATCH] upb: remove and from port/def.inc PiperOrigin-RevId: 559234283 --- upb/lex/atoi.h | 2 ++ upb/lex/unicode.h | 2 ++ upb/mem/arena.h | 2 ++ upb/mini_descriptor/internal/base92.h | 2 ++ upb/mini_descriptor/internal/encode.h | 2 ++ upb/mini_table/internal/enum.h | 2 ++ upb/mini_table/internal/field.h | 2 ++ upb/port/def.inc | 2 -- upb/wire/internal/swap.h | 2 ++ 9 files changed, 16 insertions(+), 2 deletions(-) diff --git a/upb/lex/atoi.h b/upb/lex/atoi.h index 68cbb8025a..808bca8a4a 100644 --- a/upb/lex/atoi.h +++ b/upb/lex/atoi.h @@ -31,6 +31,8 @@ #ifndef UPB_LEX_ATOI_H_ #define UPB_LEX_ATOI_H_ +#include + // Must be last. #include "upb/port/def.inc" diff --git a/upb/lex/unicode.h b/upb/lex/unicode.h index 177b721b0e..ed5615e1b6 100644 --- a/upb/lex/unicode.h +++ b/upb/lex/unicode.h @@ -31,6 +31,8 @@ #ifndef UPB_LEX_UNICODE_H_ #define UPB_LEX_UNICODE_H_ +#include + // Must be last. #include "upb/port/def.inc" diff --git a/upb/mem/arena.h b/upb/mem/arena.h index 6c1919c4a2..72e8ddb7a4 100644 --- a/upb/mem/arena.h +++ b/upb/mem/arena.h @@ -43,6 +43,8 @@ #ifndef UPB_MEM_ARENA_H_ #define UPB_MEM_ARENA_H_ +#include +#include #include #include "upb/mem/alloc.h" diff --git a/upb/mini_descriptor/internal/base92.h b/upb/mini_descriptor/internal/base92.h index 24be2f8de0..ff515e97c8 100644 --- a/upb/mini_descriptor/internal/base92.h +++ b/upb/mini_descriptor/internal/base92.h @@ -31,6 +31,8 @@ #ifndef UPB_MINI_DESCRIPTOR_INTERNAL_BASE92_H_ #define UPB_MINI_DESCRIPTOR_INTERNAL_BASE92_H_ +#include + #include "upb/base/internal/log2.h" // Must be last. diff --git a/upb/mini_descriptor/internal/encode.h b/upb/mini_descriptor/internal/encode.h index 0e016478e6..104ae311a1 100644 --- a/upb/mini_descriptor/internal/encode.h +++ b/upb/mini_descriptor/internal/encode.h @@ -31,6 +31,8 @@ #ifndef UPB_MINI_DESCRIPTOR_INTERNAL_ENCODE_H_ #define UPB_MINI_DESCRIPTOR_INTERNAL_ENCODE_H_ +#include + #include "upb/base/descriptor_constants.h" // Must be last. diff --git a/upb/mini_table/internal/enum.h b/upb/mini_table/internal/enum.h index fe14216d97..470326c6f7 100644 --- a/upb/mini_table/internal/enum.h +++ b/upb/mini_table/internal/enum.h @@ -31,6 +31,8 @@ #ifndef UPB_MINI_TABLE_INTERNAL_ENUM_H_ #define UPB_MINI_TABLE_INTERNAL_ENUM_H_ +#include + // Must be last. #include "upb/port/def.inc" diff --git a/upb/mini_table/internal/field.h b/upb/mini_table/internal/field.h index b614847658..7a0ff51ae4 100644 --- a/upb/mini_table/internal/field.h +++ b/upb/mini_table/internal/field.h @@ -31,6 +31,8 @@ #ifndef UPB_MINI_TABLE_INTERNAL_FIELD_H_ #define UPB_MINI_TABLE_INTERNAL_FIELD_H_ +#include + #include "upb/base/descriptor_constants.h" // Must be last. diff --git a/upb/port/def.inc b/upb/port/def.inc index c5f61e5ee4..f243604cfb 100644 --- a/upb/port/def.inc +++ b/upb/port/def.inc @@ -68,8 +68,6 @@ #include #include #include -#include -#include #include #if UINTPTR_MAX == 0xffffffff diff --git a/upb/wire/internal/swap.h b/upb/wire/internal/swap.h index 6308cdc427..9d9e780c37 100644 --- a/upb/wire/internal/swap.h +++ b/upb/wire/internal/swap.h @@ -31,6 +31,8 @@ #ifndef UPB_WIRE_INTERNAL_SWAP_H_ #define UPB_WIRE_INTERNAL_SWAP_H_ +#include + // Must be last. #include "upb/port/def.inc"