diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2018-04-02 14:09:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 14:09:19 -0400 |
| commit | aab0f898c9a738fbd4d6991080962d443f6e42ed (patch) | |
| tree | 9192193878b9534b334e928464e7c8ca739bbfb8 /objectivec/google/protobuf/Api.pbobjc.h | |
| parent | 7bf47a6b5d10382a4b427677cf7ca9288f4e2833 (diff) | |
| parent | bd941d5d69de8eeea6a10669fab9a4605c95650e (diff) | |
| download | protobuf-aab0f898c9a738fbd4d6991080962d443f6e42ed.tar.gz protobuf-aab0f898c9a738fbd4d6991080962d443f6e42ed.tar.bz2 protobuf-aab0f898c9a738fbd4d6991080962d443f6e42ed.zip | |
Merge pull request #4464 from thomasvl/includes3
Move ObjC WKTs to minimal imports to avoid import cycle.
Diffstat (limited to 'objectivec/google/protobuf/Api.pbobjc.h')
| -rw-r--r-- | objectivec/google/protobuf/Api.pbobjc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/objectivec/google/protobuf/Api.pbobjc.h b/objectivec/google/protobuf/Api.pbobjc.h index 095fc2cd..c93f3f15 100644 --- a/objectivec/google/protobuf/Api.pbobjc.h +++ b/objectivec/google/protobuf/Api.pbobjc.h @@ -8,9 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import <Protobuf/GPBProtocolBuffers.h> + #import <Protobuf/GPBDescriptor.h> + #import <Protobuf/GPBMessage.h> + #import <Protobuf/GPBRootObject.h> #else - #import "GPBProtocolBuffers.h" + #import "GPBDescriptor.h" + #import "GPBMessage.h" + #import "GPBRootObject.h" #endif #if GOOGLE_PROTOBUF_OBJC_VERSION < 30002 |