Fix file missing in merge from 25.x

PiperOrigin-RevId: 579036296
pull/14601/head
Mike Kruskal 1 year ago committed by Copybara-Service
parent 2e5e2783cc
commit 0d5cb3a6a6
  1. 8
      src/google/protobuf/stubs/common.h

@ -44,7 +44,7 @@ namespace internal {
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
#define GOOGLE_PROTOBUF_VERSION 4024000
#define GOOGLE_PROTOBUF_VERSION 4025000
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
@ -52,15 +52,15 @@ namespace internal {
// The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code
// generator.
static const int kMinHeaderVersionForLibrary = 4024000;
static const int kMinHeaderVersionForLibrary = 4025000;
// The minimum protoc version which works with the current version of the
// headers.
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 4024000
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 4025000
// The minimum header version which works with the current version of
// protoc. This constant should only be used in VerifyVersion().
static const int kMinHeaderVersionForProtoc = 4024000;
static const int kMinHeaderVersionForProtoc = 4025000;
// Verifies that the headers and libraries are compatible. Use the macro
// below to call this.

Loading…
Cancel
Save