diff options
| author | kjellander <kjellander@webrtc.org> | 2015-12-18 04:28:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-18 12:28:49 +0000 |
| commit | 9b7fc7f25d20a4e4562ec79e8a2aa9798956f80c (patch) | |
| tree | e2a44e57e80aae55c4b1cff4a6df8fe1c67fd0c2 /webrtc/modules | |
| parent | ae2c5ad12afc8cc29fe9c59dea432b697b871a87 (diff) | |
| download | webrtc-9b7fc7f25d20a4e4562ec79e8a2aa9798956f80c.tar.gz | |
Defines for ARM and MIPS CPU types.
This removes a dependency on Chromium's build/build_config.h
(which is not allowed).
The added defines are identical to the ones in build/build_config.h.
NOTRY=True
Review URL: https://codereview.webrtc.org/1532333002
Cr-Commit-Position: refs/heads/master@{#11082}
Diffstat (limited to 'webrtc/modules')
| -rw-r--r-- | webrtc/modules/desktop_capture/differ_block.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webrtc/modules/desktop_capture/differ_block.cc b/webrtc/modules/desktop_capture/differ_block.cc index 0dcb377411..d4cbda3601 100644 --- a/webrtc/modules/desktop_capture/differ_block.cc +++ b/webrtc/modules/desktop_capture/differ_block.cc @@ -12,7 +12,7 @@ #include <string.h> -#include "build/build_config.h" +#include "webrtc/typedefs.h" #include "webrtc/modules/desktop_capture/differ_block_sse2.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" @@ -38,7 +38,7 @@ bool BlockDifference(const uint8_t* image1, static bool (*diff_proc)(const uint8_t*, const uint8_t*, int) = NULL; if (!diff_proc) { -#if defined(ARCH_CPU_ARM_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY) +#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY) // For ARM and MIPS processors, always use C version. // TODO(hclam): Implement a NEON version. diff_proc = &BlockDifference_C; |