diff options
author | Chih-hung Hsieh <chh@google.com> | 2016-01-20 17:01:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-20 17:01:36 +0000 |
commit | 9a337512d97e37afc142dee4fd50a41b741a87d2 (patch) | |
tree | 28c4cf735dd5bd9cc8f1ccd06fff8a173b20d1cb /webrtc/system_wrappers/include/cpu_info.h | |
parent | fe8b4a657979b49e1701bd92f6d5814a99e0b2be (diff) | |
parent | daef292e03c8d7d32e650495612f336c1830013a (diff) | |
download | webrtc-9a337512d97e37afc142dee4fd50a41b741a87d2.tar.gz |
Merge "Merge upstream SHA 04cb763"
Diffstat (limited to 'webrtc/system_wrappers/include/cpu_info.h')
-rw-r--r-- | webrtc/system_wrappers/include/cpu_info.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc/system_wrappers/include/cpu_info.h b/webrtc/system_wrappers/include/cpu_info.h index 65888b8d32..3c00d33ed3 100644 --- a/webrtc/system_wrappers/include/cpu_info.h +++ b/webrtc/system_wrappers/include/cpu_info.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CPU_INFO_H_ -#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CPU_INFO_H_ +#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ +#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ #include "webrtc/typedefs.h" @@ -25,4 +25,4 @@ class CpuInfo { } // namespace webrtc -#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CPU_INFO_H_ +#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_INFO_H_ |