diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2016-07-01 13:54:25 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-01 13:54:25 -0700 |
commit | bdeb215cab2985195325fcd5e70c3fa751f46e0f (patch) | |
tree | 83e849351e03571358c6f5bddb0a6d82a65ab197 /objectivec/google/protobuf/Timestamp.pbobjc.h | |
parent | d4d13a4349e4e59d67f311185ddcc1890d956d7a (diff) | |
parent | 99ae32a39fefaac7112e6142da379afde3cb408f (diff) | |
download | protobuf-3.0.0-beta-3.tar.gz protobuf-3.0.0-beta-3.tar.bz2 protobuf-3.0.0-beta-3.zip |
Merge pull request #1737 from jcanizales/testv3.0.0-beta-3.33.0.0-beta-3
Merge beta-3.1 fixes into beta-3 branch
Diffstat (limited to 'objectivec/google/protobuf/Timestamp.pbobjc.h')
-rw-r--r-- | objectivec/google/protobuf/Timestamp.pbobjc.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/objectivec/google/protobuf/Timestamp.pbobjc.h b/objectivec/google/protobuf/Timestamp.pbobjc.h index 925dca84..d15de7c7 100644 --- a/objectivec/google/protobuf/Timestamp.pbobjc.h +++ b/objectivec/google/protobuf/Timestamp.pbobjc.h @@ -1,7 +1,17 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/timestamp.proto -#import "GPBProtocolBuffers.h" +// This CPP symbol can be defined to use imports that match up to the framework +// imports needed when using CocoaPods. +#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS) + #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0 +#endif + +#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS + #import <Protobuf/GPBProtocolBuffers.h> +#else + #import "GPBProtocolBuffers.h" +#endif #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30001 #error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources. |