diff options
| author | Joshua Haberman <joshua@reverberate.org> | 2009-07-20 13:27:25 -0700 |
|---|---|---|
| committer | Joshua Haberman <joshua@reverberate.org> | 2009-07-20 13:27:25 -0700 |
| commit | 6fe860171378a32da84b8e5bc2502c522bd9d9c7 (patch) | |
| tree | 511aa43fcf4ad6329b921ea5cc3ccd1c37dd204b /descriptor | |
| parent | 1e388b0af3d7c2384cd350a349ba756914620466 (diff) | |
Move upb_array into its own header, upb_context parses fds instead of fd.
Diffstat (limited to 'descriptor')
| -rw-r--r-- | descriptor/descriptor.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/descriptor/descriptor.h b/descriptor/descriptor.h index 1e7e927..e8765f2 100644 --- a/descriptor/descriptor.h +++ b/descriptor/descriptor.h @@ -3,7 +3,8 @@ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_H_ #define GOOGLE_PROTOBUF_DESCRIPTOR_H_ -#include "upb_msg.h" +#include "upb_string.h" +#include "upb_array.h" /* Enums. */ @@ -25,23 +26,23 @@ typedef enum google_protobuf_FieldDescriptorProto_Type { GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_SFIXED32 = 15, GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_SFIXED64 = 16, GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_SINT32 = 17, - GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_SINT64 = 18, + GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_SINT64 = 18 } google_protobuf_FieldDescriptorProto_Type; typedef enum google_protobuf_FieldDescriptorProto_Label { GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_OPTIONAL = 1, GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED = 2, - GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REPEATED = 3, + GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REPEATED = 3 } google_protobuf_FieldDescriptorProto_Label; typedef enum google_protobuf_FileOptions_OptimizeMode { GOOGLE_PROTOBUF_FILEOPTIONS_SPEED = 1, - GOOGLE_PROTOBUF_FILEOPTIONS_CODE_SIZE = 2, + GOOGLE_PROTOBUF_FILEOPTIONS_CODE_SIZE = 2 } google_protobuf_FileOptions_OptimizeMode; typedef enum google_protobuf_FieldOptions_CType { GOOGLE_PROTOBUF_FIELDOPTIONS_CORD = 1, - GOOGLE_PROTOBUF_FIELDOPTIONS_STRING_PIECE = 2, + GOOGLE_PROTOBUF_FIELDOPTIONS_STRING_PIECE = 2 } google_protobuf_FieldOptions_CType; /* Forward declarations of all message types. |