Index: webrtc/base/macutils.h |
diff --git a/webrtc/base/macutils.h b/webrtc/base/macutils.h |
index fdcb3eee5b7162e82f8eaf04284da9126c513631..ed0c4f54737d5767968704f3629557df389b06f6 100644 |
--- a/webrtc/base/macutils.h |
+++ b/webrtc/base/macutils.h |
@@ -8,43 +8,12 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#ifndef WEBRTC_BASE_MACUTILS_H__ |
-#define WEBRTC_BASE_MACUTILS_H__ |
+#ifndef WEBRTC_BASE_MACUTILS_H_ |
+#define WEBRTC_BASE_MACUTILS_H_ |
-#include <CoreFoundation/CoreFoundation.h> |
-#include <string> |
-namespace rtc { |
+// This header is deprecated and is just left here temporarily during |
+// refactoring. See https://bugs.webrtc.org/7634 for more details. |
+#include "webrtc/rtc_base/macutils.h" |
-/////////////////////////////////////////////////////////////////////////////// |
- |
-// Note that some of these functions work for both iOS and Mac OS X. The ones |
-// that are specific to Mac are #ifdef'ed as such. |
- |
-bool ToUtf8(const CFStringRef str16, std::string* str8); |
-bool ToUtf16(const std::string& str8, CFStringRef* str16); |
- |
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
-void DecodeFourChar(UInt32 fc, std::string* out); |
- |
-enum MacOSVersionName { |
- kMacOSUnknown, // ??? |
- kMacOSOlder, // 10.2- |
- kMacOSPanther, // 10.3 |
- kMacOSTiger, // 10.4 |
- kMacOSLeopard, // 10.5 |
- kMacOSSnowLeopard, // 10.6 |
- kMacOSLion, // 10.7 |
- kMacOSMountainLion, // 10.8 |
- kMacOSMavericks, // 10.9 |
- kMacOSNewer, // 10.10+ |
-}; |
- |
-MacOSVersionName GetOSVersionName(); |
-#endif |
- |
-/////////////////////////////////////////////////////////////////////////////// |
- |
-} // namespace rtc |
- |
-#endif // WEBRTC_BASE_MACUTILS_H__ |
+#endif // WEBRTC_BASE_MACUTILS_H_ |