radosgw-admin: fix conflict with KeyType in libnss

rgw/rgw_admin.cc:459:6: error: using typedef-name 'KeyType' after 'enum'
/usr/include/nss3/keythi.h:69:3: error: 'KeyType' has a previous declaration here

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 3590f379d4cd4b87b264855f1c65311a489d1349..407faf1e3994e8f334a26dfea4f89257c1cbf1c5 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -456,7 +456,7 @@ int bucket_stats(rgw_bucket& bucket, Formatter *formatter)
   return 0;
 }
 
-enum KeyType {
+enum ObjectKeyType {
   KEY_TYPE_SWIFT,
   KEY_TYPE_S3,
 };
@@ -474,7 +474,7 @@ int main(int argc, char **argv)
   std::string bucket_name, pool_name, object;
   std::string date, time, subuser, access, format;
   std::string key_type_str;
-  KeyType key_type = KEY_TYPE_S3;
+  ObjectKeyType key_type = KEY_TYPE_S3;
   rgw_bucket bucket;
   uint32_t perm_mask = 0;
   uint64_t auid = -1;