Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore protobuf-2.x compatibility #285

Merged
merged 1 commit into from Aug 14, 2017
Merged

Conversation

edmonds
Copy link
Member

@edmonds edmonds commented Aug 7, 2017

The change in commit 712154b ("Bump minimum required header version for proto3 syntax") uses functionality only exposed by protobuf-3.x, breaking the build when compiling against protobuf-2.x.

Since we still want to support building against protobuf-2.x, this commit makes the proto3 syntax check in the file generator dependent on building against protobuf-3.x.

The change in commit 712154b ("Bump
minimum required header version for proto3 syntax") uses functionality
only exposed by protobuf-3.x, breaking the build when compiling against
protobuf-2.x.

Since we still want to support building against protobuf-2.x, this
commit makes the proto3 syntax check in the file generator dependent on
building against protobuf-3.x.
@edmonds edmonds added this to the 1.3.1 milestone Aug 7, 2017
@edmonds
Copy link
Member Author

edmonds commented Aug 7, 2017

@pbor Can you review this commit?

@edmonds
Copy link
Member Author

edmonds commented Aug 7, 2017

Should fix #284.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 90.37% when pulling 4302266 on edmonds/protobuf-2.x-compatibility into dac1a65 on next.

@pbor
Copy link
Contributor

pbor commented Aug 7, 2017 via email

@ziegast
Copy link

ziegast commented Aug 14, 2017

Compiling now works vs protobuf 2.6.1 as part of farsightsec/nmsg toolkit.
Thanks!

@edmonds edmonds merged commit 4912c5a into next Aug 14, 2017
@edmonds edmonds deleted the edmonds/protobuf-2.x-compatibility branch August 14, 2017 19:36
reedjc added a commit to farsightsec/nmsg that referenced this pull request Oct 23, 2017
Travis CI was failing due to incompatibility of protobuf-c.

See protobuf-c/protobuf-c#284 and
protobuf-c/protobuf-c#285 for details.
reedjc added a commit to farsightsec/nmsg that referenced this pull request Oct 24, 2017
Travis CI was failing due to incompatibility of protobuf-c.

See protobuf-c/protobuf-c#284 and
protobuf-c/protobuf-c#285 for details.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants