Merge pull request #5297 from brian-peloton/master

Remove unused types

src/google/protobuf/extension_set.cc

@@ -280,7 +280,7 @@ void ExtensionSet::ClearExtension(int number) {
 
 namespace {
 
-enum Cardinality {
+enum {
   REPEATED,
   OPTIONAL
 };

src/google/protobuf/stubs/common.cc

@@ -342,7 +342,6 @@ uint32 ghtonl(uint32 x) {
 
 namespace internal {
 
-typedef void OnShutdownFunc();
 struct ShutdownData {
   ~ShutdownData() {
     std::reverse(functions.begin(), functions.end());