diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-08-03 16:36:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 16:36:22 -0700 |
| commit | 23dccc5bb9d6914b72cb241b027af8e7502f5fa7 (patch) | |
| tree | c83493dfb55e1135dd7721b6254e8a5946d6643a | |
| parent | 71985bed4faaaa873369be4cc8e4690dea22966c (diff) | |
| parent | 1c19892219eddcabfda3bd6b25537f2620a25806 (diff) | |
| download | protobuf-3.5.x.tar.gz protobuf-3.5.x.tar.bz2 protobuf-3.5.x.zip | |
Merge pull request #5001 from acozzette/backport-spelling-fix3.5.x
Fix spelling error of __GNUC_MINOR__
| -rw-r--r-- | src/google/protobuf/stubs/hash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 218cd948..af61a144 100644 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -93,7 +93,7 @@ # endif // GCC <= 4.1 does not define std::tr1::hash for `long long int` or `long long unsigned int` -# if __GNUC__ == 4 && defined(__GNUC__MINOR__) && __GNUC__MINOR__ <= 1 +# if __GNUC__ == 4 && defined(__GNUC_MINOR__) && __GNUC_MINOR__ <= 1 # undef GOOGLE_PROTOBUF_HAS_TR1 # undef GOOGLE_PROTOBUF_HAVE_HASH_MAP # undef GOOGLE_PROTOBUF_HAVE_HASH_SET |