Remove unneeded #defines from libjingle_xmpp.

third_party/libjingle_xmpp/xmpp/constants.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 58 matching lines @@
 const char STR_X[] = "x";
 const char STR_GOOGLE_COM[] = "google.com";
 const char STR_GMAIL_COM[] = "gmail.com";
 const char STR_GOOGLEMAIL_COM[] = "googlemail.com";
 const char STR_DEFAULT_DOMAIN[] = "default.talk.google.com";
 const char STR_TALK_GOOGLE_COM[] = "talk.google.com";
 const char STR_TALKX_L_GOOGLE_COM[] = "talkx.l.google.com";
 const char STR_XMPP_GOOGLE_COM[] = "xmpp.google.com";
 const char STR_XMPPX_L_GOOGLE_COM[] = "xmppx.l.google.com";
 
-#ifdef FEATURE_ENABLE_VOICEMAIL
 const char STR_VOICEMAIL[] = "voicemail";
 const char STR_OUTGOINGVOICEMAIL[] = "outgoingvoicemail";
-#endif
 
 const char STR_UNAVAILABLE[] = "unavailable";
 
 const char NS_PING[] = "urn:xmpp:ping";
 const StaticQName QN_PING = { NS_PING, "ping" };
 
 const char NS_MUC_UNIQUE[] = "http://jabber.org/protocol/muc#unique";
 const StaticQName QN_MUC_UNIQUE_QUERY = { NS_MUC_UNIQUE, "unique" };
 const StaticQName QN_HANGOUT_ID = { STR_EMPTY, "hangout-id" };
 
@@ skipping 511 matching lines @@
     { NS_GOOGLE_MUC_MEDIA, "recording" };
 const StaticQName QN_GOOGLE_MUC_MEDIA_BLOCK = { NS_GOOGLE_MUC_MEDIA, "block" };
 const StaticQName QN_STATE_ATTR = { STR_EMPTY, "state" };
 
 const char AUTH_MECHANISM_GOOGLE_COOKIE[] = "X-GOOGLE-COOKIE";
 const char AUTH_MECHANISM_GOOGLE_TOKEN[] = "X-GOOGLE-TOKEN";
 const char AUTH_MECHANISM_OAUTH2[] = "X-OAUTH2";
 const char AUTH_MECHANISM_PLAIN[] = "PLAIN";
 
 }  // namespace buzz