Remove the forced srtp for Mac.
Review URL: http://webrtc-codereview.appspot.com/259004
git-svn-id: http://libjingle.googlecode.com/svn/trunk@94 dd674b97-3498-5ee5-1854-bdd07cd0ff33
diff --git a/talk/session/phone/srtpfilter.cc b/talk/session/phone/srtpfilter.cc
index 4bf94f7..e708b50 100644
--- a/talk/session/phone/srtpfilter.cc
+++ b/talk/session/phone/srtpfilter.cc
@@ -25,22 +25,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// talk's config.h, generated from mac_config_dot_h for OSX, conflicts with the
-// one included by the libsrtp headers. Don't use it. Instead, we keep HAVE_SRTP
-// and LOGGING defined in config.h.
#undef HAVE_CONFIG_H
-#ifdef OSX
-// TODO: For the XCode build, we force SRTP (b/2500074)
-#ifndef HAVE_SRTP
-#define HAVE_SRTP 1
-#endif // HAVE_SRTP
-// If LOGGING is not defined, define it to 1 (b/3245816)
-#ifndef LOGGING
-#define LOGGING 1
-#endif // HAVE_SRTP
-#endif
-
#include "talk/session/phone/srtpfilter.h"
#include <algorithm>
