From a4e7bf61d48320944f0e49ea932c9c119ca7a42d Mon Sep 17 00:00:00 2001
From: csharptest <roger@csharptest.net>
Date: Sat, 1 Oct 2011 11:56:01 -0500
Subject: [PATCH] Case-insensitive name conflict with Enumopt and EnumOpt,
 renamed one of them

---
 protos/google/protobuf/unittest_custom_options.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/protos/google/protobuf/unittest_custom_options.proto b/protos/google/protobuf/unittest_custom_options.proto
index 1ff6946aa4..201fb32a6e 100644
--- a/protos/google/protobuf/unittest_custom_options.proto
+++ b/protos/google/protobuf/unittest_custom_options.proto
@@ -325,7 +325,7 @@ message Aggregate {
 extend google.protobuf.FileOptions      { optional Aggregate fileopt    = 15478479; }
 extend google.protobuf.MessageOptions   { optional Aggregate msgopt     = 15480088; }
 extend google.protobuf.FieldOptions     { optional Aggregate fieldopt   = 15481374; }
-extend google.protobuf.EnumOptions      { optional Aggregate enumopt    = 15483218; }
+extend google.protobuf.EnumOptions      { optional Aggregate enumopt_renamed    = 15483218; }
 extend google.protobuf.EnumValueOptions { optional Aggregate enumvalopt = 15486921; }
 extend google.protobuf.ServiceOptions   { optional Aggregate serviceopt = 15497145; }
 extend google.protobuf.MethodOptions    { optional Aggregate methodopt  = 15512713; }
@@ -367,6 +367,6 @@ service AggregateService {
 }
 
 enum AggregateEnum {
-  option (enumopt) = { s:'EnumAnnotation' };
+  option (enumopt_renamed) = { s:'EnumAnnotation' };
   VALUE = 1 [(enumvalopt) = { s:'EnumValueAnnotation' }];
 }